diff --git a/promunifi/clients.go b/promunifi/clients.go
index 672727d8..78705fc3 100644
--- a/promunifi/clients.go
+++ b/promunifi/clients.go
@@ -50,35 +50,35 @@ func descClient(ns string) *uclient {
 
 	return &uclient{
 		Anomalies:         prometheus.NewDesc(ns+"anomalies_total", "Client Anomalies", labels, nil),
-		BytesR:            prometheus.NewDesc(ns+"bytes_rate", "Client Data Rate", labels, nil),
-		CCQ:               prometheus.NewDesc(ns+"ccq", "Client Connection Quality", labels, nil),
+		BytesR:            prometheus.NewDesc(ns+"transfer_rate_bytes", "Client Data Rate", labels, nil),
+		CCQ:               prometheus.NewDesc(ns+"ccq_percent", "Client Connection Quality", labels, nil),
 		Noise:             prometheus.NewDesc(ns+"noise_db", "Client AP Noise", labels, nil),
-		RoamCount:         prometheus.NewDesc(ns+"roam_total", "Client Roam Counter", labels, nil),
+		RoamCount:         prometheus.NewDesc(ns+"roam_count_total", "Client Roam Counter", labels, nil),
 		RSSI:              prometheus.NewDesc(ns+"rssi", "Client RSSI", labels, nil),
-		RxBytes:           prometheus.NewDesc(ns+"bytes_rx_total", "Client Receive Bytes", labels, nil),
-		RxBytesR:          prometheus.NewDesc(ns+"bytes_rx_rate", "Client Receive Data Rate", labels, nil),
-		RxPackets:         prometheus.NewDesc(ns+"packets_rx_total", "Client Receive Packets", labels, nil),
-		RxRate:            prometheus.NewDesc(ns+"rate", "Client Receive Rate", labels, nil),
-		Signal:            prometheus.NewDesc(ns+"signal", "Client Signal Strength", labels, nil),
-		TxBytes:           prometheus.NewDesc(ns+"bytes_tx_total", "Client Transmit Bytes", labels, nil),
-		TxBytesR:          prometheus.NewDesc(ns+"bytes_tx_rate", "Client Transmit Data Rate", labels, nil),
-		TxPackets:         prometheus.NewDesc(ns+"packets_tx_total", "Client Transmit Packets", labels, nil),
-		TxPower:           prometheus.NewDesc(ns+"radio_tx_power", "Client Transmit Power", labels, nil),
-		TxRate:            prometheus.NewDesc(ns+"radio_tx_rate", "Client Transmit Rate", labels, nil),
+		RxBytes:           prometheus.NewDesc(ns+"receive_bytes_total", "Client Receive Bytes", labels, nil),
+		RxBytesR:          prometheus.NewDesc(ns+"receive_rate_bytes", "Client Receive Data Rate", labels, nil),
+		RxPackets:         prometheus.NewDesc(ns+"receive_packets_total", "Client Receive Packets", labels, nil),
+		RxRate:            prometheus.NewDesc(ns+"radio_receive_rate", "Client Receive Rate", labels, nil),
+		Signal:            prometheus.NewDesc(ns+"radio_signal", "Client Signal Strength", labels, nil),
+		TxBytes:           prometheus.NewDesc(ns+"transmit_bytes_total", "Client Transmit Bytes", labels, nil),
+		TxBytesR:          prometheus.NewDesc(ns+"transmit_rate_bytes", "Client Transmit Data Rate", labels, nil),
+		TxPackets:         prometheus.NewDesc(ns+"transmit_packets_total", "Client Transmit Packets", labels, nil),
+		TxPower:           prometheus.NewDesc(ns+"radio_transmit_power", "Client Transmit Power", labels, nil),
+		TxRate:            prometheus.NewDesc(ns+"radio_transmit_rate", "Client Transmit Rate", labels, nil),
 		Uptime:            prometheus.NewDesc(ns+"uptime", "Client Uptime", labels, nil),
-		WifiTxAttempts:    prometheus.NewDesc(ns+"wifi_attempts_tx_total", "Client Wifi Transmit Attempts", labels, nil),
-		WiredRxBytes:      prometheus.NewDesc(ns+"wired_bytes_rx_total", "Client Wired Receive Bytes", labels, nil),
-		WiredRxBytesR:     prometheus.NewDesc(ns+"wired_bytes_rx_rate", "Client Wired Receive Data Rate", labels, nil),
-		WiredRxPackets:    prometheus.NewDesc(ns+"wired_packets_rx_total", "Client Wired Receive Packets", labels, nil),
-		WiredTxBytes:      prometheus.NewDesc(ns+"wired_bytes_tx_total", "Client Wired Transmit Bytes", labels, nil),
-		WiredTxBytesR:     prometheus.NewDesc(ns+"wired_bytes_tx_rate", "Client Wired Data Rate", labels, nil),
-		WiredTxPackets:    prometheus.NewDesc(ns+"wired_packets_tx_total", "Client Wired Transmit Packets", labels, nil),
+		WifiTxAttempts:    prometheus.NewDesc(ns+"wifi_attempts_transmit_total", "Client Wifi Transmit Attempts", labels, nil),
+		WiredRxBytes:      prometheus.NewDesc(ns+"wired_receive_bytes_total", "Client Wired Receive Bytes", labels, nil),
+		WiredRxBytesR:     prometheus.NewDesc(ns+"wired_receive_rate_bytes", "Client Wired Receive Data Rate", labels, nil),
+		WiredRxPackets:    prometheus.NewDesc(ns+"wired_receive_packets_total", "Client Wired Receive Packets", labels, nil),
+		WiredTxBytes:      prometheus.NewDesc(ns+"wired_transmit_bytes_total", "Client Wired Transmit Bytes", labels, nil),
+		WiredTxBytesR:     prometheus.NewDesc(ns+"wired_transmit_rate_bytes", "Client Wired Data Rate", labels, nil),
+		WiredTxPackets:    prometheus.NewDesc(ns+"wired_transmit_packets_total", "Client Wired Transmit Packets", labels, nil),
 		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),
-		DpiStatsRxBytes:   prometheus.NewDesc(ns+"dpi_stats_bytes_rx_total", "Client DPI Stats Receive Bytes", labels, nil),
-		DpiStatsRxPackets: prometheus.NewDesc(ns+"dpi_stats_packets_rx_total", "Client DPI Stats Receive Packets", labels, nil),
-		DpiStatsTxBytes:   prometheus.NewDesc(ns+"dpi_stats_bytes_tx_total", "Client DPI Stats Transmit Bytes", labels, nil),
-		DpiStatsTxPackets: prometheus.NewDesc(ns+"dpi_stats_packets_tx_total", "Client DPI Stats Transmit Packets", labels, nil),
+		DpiStatsRxBytes:   prometheus.NewDesc(ns+"dpi_stats_receive_bytes_total", "Client DPI Stats Receive Bytes", labels, nil),
+		DpiStatsRxPackets: prometheus.NewDesc(ns+"dpi_stats_receive_packets_total", "Client DPI Stats Receive Packets", labels, nil),
+		DpiStatsTxBytes:   prometheus.NewDesc(ns+"dpi_stats_transmit_bytes_total", "Client DPI Stats Transmit Bytes", labels, nil),
+		DpiStatsTxPackets: prometheus.NewDesc(ns+"dpi_stats_transmit_packets_total", "Client DPI Stats Transmit Packets", labels, nil),
 	}
 }
 
diff --git a/promunifi/site.go b/promunifi/site.go
index f525a819..9ee5ee8e 100644
--- a/promunifi/site.go
+++ b/promunifi/site.go
@@ -21,6 +21,7 @@ type site struct {
 	NumSta                *prometheus.Desc
 	Latency               *prometheus.Desc
 	Drops                 *prometheus.Desc
+	Uptime                *prometheus.Desc
 	XputUp                *prometheus.Desc
 	XputDown              *prometheus.Desc
 	SpeedtestPing         *prometheus.Desc
@@ -36,33 +37,34 @@ func descSite(ns string) *site {
 	if ns += "_site_"; ns == "_site_" {
 		ns = "site_"
 	}
-	labels := []string{"subsystem", "status", "gwversion", "name", "desc", "site_name"}
+	labels := []string{"subsystem", "status", "name", "desc", "site_name"}
 
 	return &site{
-		NumUser:               prometheus.NewDesc(ns+"user_total", "Number of Users", labels, nil),
-		NumGuest:              prometheus.NewDesc(ns+"guest_total", "Number of Guests", labels, nil),
-		NumIot:                prometheus.NewDesc(ns+"iot_total", "Number of IoT Devices", labels, nil),
-		TxBytesR:              prometheus.NewDesc(ns+"bytes_tx_rate", "Bytes Transmit Rate", labels, nil),
-		RxBytesR:              prometheus.NewDesc(ns+"bytes_rx_rate", "Bytes Receive Rate", labels, nil),
-		NumAp:                 prometheus.NewDesc(ns+"ap_total", "Access Point Count", labels, nil),
-		NumAdopted:            prometheus.NewDesc(ns+"adopted_total", "Adoption Count", labels, nil),
-		NumDisabled:           prometheus.NewDesc(ns+"disabled_total", "Disabled Count", labels, nil),
-		NumDisconnected:       prometheus.NewDesc(ns+"disconnected_total", "Disconnected Count", labels, nil),
-		NumPending:            prometheus.NewDesc(ns+"pending_total", "Pending Count", labels, nil),
-		NumGw:                 prometheus.NewDesc(ns+"gateways_total", "Gateway Count", labels, nil),
-		NumSw:                 prometheus.NewDesc(ns+"switches_total", "Switch Count", labels, nil),
-		NumSta:                prometheus.NewDesc(ns+"stations_total", "Station Count", labels, nil),
-		Latency:               prometheus.NewDesc(ns+"latency", "Latency", labels, nil),
-		Drops:                 prometheus.NewDesc(ns+"drops_total", "Drops", labels, nil),
+		NumUser:               prometheus.NewDesc(ns+"num_user_total", "Number of Users", labels, nil),
+		NumGuest:              prometheus.NewDesc(ns+"num_guest_total", "Number of Guests", labels, nil),
+		NumIot:                prometheus.NewDesc(ns+"num_iot_total", "Number of IoT Devices", labels, nil),
+		TxBytesR:              prometheus.NewDesc(ns+"transmit_rate_bytes", "Bytes Transmit Rate", labels, nil),
+		RxBytesR:              prometheus.NewDesc(ns+"receive_rate_bytes", "Bytes Receive Rate", labels, nil),
+		NumAp:                 prometheus.NewDesc(ns+"num_ap_total", "Access Point Count", labels, nil),
+		NumAdopted:            prometheus.NewDesc(ns+"num_adopted_total", "Adoption Count", labels, nil),
+		NumDisabled:           prometheus.NewDesc(ns+"num_disabled_total", "Disabled Count", labels, nil),
+		NumDisconnected:       prometheus.NewDesc(ns+"num_disconnected_total", "Disconnected Count", labels, nil),
+		NumPending:            prometheus.NewDesc(ns+"num_pending_total", "Pending Count", labels, nil),
+		NumGw:                 prometheus.NewDesc(ns+"num_gateways_total", "Gateway Count", labels, nil),
+		NumSw:                 prometheus.NewDesc(ns+"num_switches_total", "Switch Count", labels, nil),
+		NumSta:                prometheus.NewDesc(ns+"num_stations_total", "Station Count", labels, nil),
+		Latency:               prometheus.NewDesc(ns+"latency_ms", "Latency", labels, nil),
+		Uptime:                prometheus.NewDesc(ns+"uptime_seconds", "Uptime", labels, nil),
+		Drops:                 prometheus.NewDesc(ns+"intenet_drops_total", "Internet (WAN) Disconnections", labels, nil),
 		XputUp:                prometheus.NewDesc(ns+"xput_up_rate", "Speedtest Upload", labels, nil),
 		XputDown:              prometheus.NewDesc(ns+"xput_down_rate", "Speedtest Download", labels, nil),
 		SpeedtestPing:         prometheus.NewDesc(ns+"speedtest_ping", "Speedtest Ping", labels, nil),
-		RemoteUserNumActive:   prometheus.NewDesc(ns+"remote_user_active_total", "Remote Users Active", labels, nil),
-		RemoteUserNumInactive: prometheus.NewDesc(ns+"remote_user_inactive_total", "Remote Users Inactive", labels, nil),
-		RemoteUserRxBytes:     prometheus.NewDesc(ns+"remote_user_rx_bytes_total", "Remote Users Receive Bytes", labels, nil),
-		RemoteUserTxBytes:     prometheus.NewDesc(ns+"remote_user_tx_bytes_total", "Remote Users Transmit Bytes", labels, nil),
-		RemoteUserRxPackets:   prometheus.NewDesc(ns+"remote_user_rx_packets_total", "Remote Users Receive Packets", labels, nil),
-		RemoteUserTxPackets:   prometheus.NewDesc(ns+"remote_user_tx_packets_total", "Remote Users Transmit Packets", labels, nil),
+		RemoteUserNumActive:   prometheus.NewDesc(ns+"num_remote_user_active_total", "Remote Users Active", labels, nil),
+		RemoteUserNumInactive: prometheus.NewDesc(ns+"num_remote_user_inactive_total", "Remote Users Inactive", labels, nil),
+		RemoteUserRxBytes:     prometheus.NewDesc(ns+"remote_user_receive_bytes_total", "Remote Users Receive Bytes", labels, nil),
+		RemoteUserTxBytes:     prometheus.NewDesc(ns+"remote_user_transmit_bytes_total", "Remote Users Transmit Bytes", labels, nil),
+		RemoteUserRxPackets:   prometheus.NewDesc(ns+"remote_user_receive_packets_total", "Remote Users Receive Packets", labels, nil),
+		RemoteUserTxPackets:   prometheus.NewDesc(ns+"remote_user_transmit_packets_total", "Remote Users Transmit Packets", labels, nil),
 	}
 }
 
@@ -71,31 +73,15 @@ func (u *unifiCollector) exportSites(sites unifi.Sites, r *Report) {
 		metrics := []*metricExports{}
 		labels := []string{s.Name, s.Desc, s.SiteName}
 		for _, h := range s.Health {
-			l := append([]string{h.Subsystem, h.Status, h.GwVersion}, labels...)
+			l := append([]string{h.Subsystem, h.Status}, labels...)
 
-			// XXX: More of these are subsystem specific (like the vpn/remote user stuff below)
-			metrics = append(metrics, []*metricExports{
-				{u.Site.NumUser, prometheus.CounterValue, h.NumUser.Val, l},
-				{u.Site.NumGuest, prometheus.CounterValue, h.NumGuest.Val, l},
-				{u.Site.NumIot, prometheus.CounterValue, h.NumIot.Val, l},
-				{u.Site.TxBytesR, prometheus.GaugeValue, h.TxBytesR.Val, l},
-				{u.Site.RxBytesR, prometheus.GaugeValue, h.RxBytesR.Val, l},
-				{u.Site.NumAp, prometheus.CounterValue, h.NumAp.Val, l},
-				{u.Site.NumAdopted, prometheus.CounterValue, h.NumAdopted.Val, l},
-				{u.Site.NumDisabled, prometheus.CounterValue, h.NumDisabled.Val, l},
-				{u.Site.NumDisconnected, prometheus.CounterValue, h.NumDisconnected.Val, l},
-				{u.Site.NumPending, prometheus.CounterValue, h.NumPending.Val, l},
-				{u.Site.NumGw, prometheus.CounterValue, h.NumGw.Val, l},
-				{u.Site.NumSw, prometheus.CounterValue, h.NumSw.Val, l},
-				{u.Site.NumSta, prometheus.CounterValue, h.NumSta.Val, l},
-				{u.Site.Latency, prometheus.GaugeValue, h.Latency.Val, l},
-				{u.Site.Drops, prometheus.CounterValue, h.Drops.Val, l},
-				{u.Site.XputUp, prometheus.GaugeValue, h.XputUp.Val, l},
-				{u.Site.XputDown, prometheus.GaugeValue, h.XputDown.Val, l},
-				{u.Site.SpeedtestPing, prometheus.GaugeValue, h.SpeedtestPing.Val, l},
-			}...)
+			if h.Subsystem != "vpn" {
+				metrics = append(metrics, []*metricExports{
+					{u.Site.TxBytesR, prometheus.GaugeValue, h.TxBytesR.Val, l},
+					{u.Site.RxBytesR, prometheus.GaugeValue, h.RxBytesR.Val, l},
+				}...)
 
-			if h.Subsystem == "vpn" {
+			} else {
 				metrics = append(metrics, []*metricExports{
 					{u.Site.RemoteUserNumActive, prometheus.CounterValue, h.RemoteUserNumActive.Val, l},
 					{u.Site.RemoteUserNumInactive, prometheus.CounterValue, h.RemoteUserNumInactive.Val, l},
@@ -105,6 +91,53 @@ func (u *unifiCollector) exportSites(sites unifi.Sites, r *Report) {
 					{u.Site.RemoteUserTxPackets, prometheus.CounterValue, h.RemoteUserTxPackets.Val, l},
 				}...)
 			}
+
+			if h.Subsystem == "lan" || h.Subsystem == "wlan" || h.Subsystem == "wan" {
+				metrics = append(metrics, []*metricExports{
+					{u.Site.NumAdopted, prometheus.CounterValue, h.NumAdopted.Val, l},
+					{u.Site.NumDisconnected, prometheus.CounterValue, h.NumDisconnected.Val, l},
+					{u.Site.NumPending, prometheus.CounterValue, h.NumPending.Val, l},
+				}...)
+			}
+
+			if h.Subsystem == "lan" || h.Subsystem == "wlan" {
+				metrics = append(metrics, []*metricExports{
+					{u.Site.NumUser, prometheus.CounterValue, h.NumUser.Val, l},
+					{u.Site.NumGuest, prometheus.CounterValue, h.NumGuest.Val, l},
+					{u.Site.NumIot, prometheus.CounterValue, h.NumIot.Val, l},
+				}...)
+			}
+
+			if h.Subsystem == "wlan" {
+				metrics = append(metrics, []*metricExports{
+					{u.Site.NumAp, prometheus.CounterValue, h.NumAp.Val, l},
+					{u.Site.NumDisabled, prometheus.CounterValue, h.NumDisabled.Val, l},
+				}...)
+			}
+
+			if h.Subsystem == "wan" {
+				metrics = append(metrics, []*metricExports{
+					{u.Site.NumGw, prometheus.CounterValue, h.NumGw.Val, l},
+					{u.Site.NumSta, prometheus.CounterValue, h.NumSta.Val, l},
+				}...)
+			}
+
+			if h.Subsystem == "lan" {
+				metrics = append(metrics, []*metricExports{
+					{u.Site.NumSw, prometheus.CounterValue, h.NumSw.Val, l},
+				}...)
+			}
+
+			if h.Subsystem == "www" {
+				metrics = append(metrics, []*metricExports{
+					{u.Site.Uptime, prometheus.GaugeValue, h.Latency.Val, l},
+					{u.Site.Latency, prometheus.GaugeValue, h.Latency.Val, l},
+					{u.Site.XputUp, prometheus.GaugeValue, h.XputUp.Val, l},
+					{u.Site.XputDown, prometheus.GaugeValue, h.XputDown.Val, l},
+					{u.Site.SpeedtestPing, prometheus.GaugeValue, h.SpeedtestPing.Val, l},
+					{u.Site.Drops, prometheus.CounterValue, h.Drops.Val, l},
+				}...)
+			}
 		}
 		r.ch <- metrics
 	}
diff --git a/promunifi/uap.go b/promunifi/uap.go
index 2aac5810..32c4195b 100644
--- a/promunifi/uap.go
+++ b/promunifi/uap.go
@@ -114,39 +114,39 @@ func descUAP(ns string) *uap {
 
 	return &uap{
 		Uptime:       prometheus.NewDesc(ns+"uptime", "Uptime", labels, nil),
-		TotalTxBytes: prometheus.NewDesc(ns+"bytes_tx_total", "Total Transmitted Bytes", labels, nil),
-		TotalRxBytes: prometheus.NewDesc(ns+"bytes_rx_total", "Total Received Bytes", 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+"bytes_total", "Total Bytes Transferred", labels, nil),
-		BytesD:       prometheus.NewDesc(ns+"bytes_d_total", "Total Bytes D???", labels, nil),
-		TxBytesD:     prometheus.NewDesc(ns+"bytes_d_tx", "Transmit Bytes D???", labels, nil),
-		RxBytesD:     prometheus.NewDesc(ns+"bytes_d_rx", "Receive Bytes D???", labels, nil),
-		BytesR:       prometheus.NewDesc(ns+"bytes_rate", "Transfer Rate", labels, nil),
-		NumSta:       prometheus.NewDesc(ns+"stations_total", "Number of Stations", labels, nil),
-		UserNumSta:   prometheus.NewDesc(ns+"stations_user_total", "Number of User Stations", labels, nil),
-		GuestNumSta:  prometheus.NewDesc(ns+"stations_guest_total", "Number of Guest Stations", labels, nil),
+		BytesD:       prometheus.NewDesc(ns+"d_bytes", "Total Bytes D???", labels, nil),
+		TxBytesD:     prometheus.NewDesc(ns+"d_tranmsit_bytes", "Transmit Bytes D???", labels, nil),
+		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+"num_stations_total", "Number of Stations", labels, nil),
+		UserNumSta:   prometheus.NewDesc(ns+"num_stations_user_total", "Number of User Stations", labels, nil),
+		GuestNumSta:  prometheus.NewDesc(ns+"num_stations_guest_total", "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),
 		MemUsed:      prometheus.NewDesc(ns+"memory_used_bytes", "System Memory Used", labels, nil),
 		MemTotal:     prometheus.NewDesc(ns+"memory_installed_bytes", "System Installed Memory", labels, nil),
 		MemBuffer:    prometheus.NewDesc(ns+"memory_buffer_bytes", "System Memory Buffer", labels, nil),
-		CPU:          prometheus.NewDesc(ns+"cpu_utilization", "System CPU % Utilized", labels, nil),
-		Mem:          prometheus.NewDesc(ns+"memory_utilization", "System Memory % Utilized", labels, nil),
-		ApBytes:      prometheus.NewDesc(ns+"bytes_transferred_total", "Total Bytes Moved", labels, nil),
+		CPU:          prometheus.NewDesc(ns+"cpu_utilization_percent", "System CPU % Utilized", labels, nil),
+		Mem:          prometheus.NewDesc(ns+"memory_utilization_percent", "System Memory % Utilized", labels, nil),
+		ApBytes:      prometheus.NewDesc(ns+"transferred_bytes_total", "Total Bytes Moved", labels, nil),
 
 		// 3x each - stat table: total, guest, user
 		ApWifiTxDropped:     prometheus.NewDesc(ns+"stat_wifi_transmt_dropped_total", "Wifi Transmissions Dropped", labelA, nil),
-		ApRxErrors:          prometheus.NewDesc(ns+"stat_errors_rx_total", "Receive Errors", labelA, nil),
-		ApRxDropped:         prometheus.NewDesc(ns+"stat_dropped_rx_total", "Receive Dropped", labelA, nil),
-		ApRxFrags:           prometheus.NewDesc(ns+"stat_frags_rx_total", "Received Frags", labelA, nil),
-		ApRxCrypts:          prometheus.NewDesc(ns+"stat_crypts_rx_total", "Receive Crypts", labelA, nil),
-		ApTxPackets:         prometheus.NewDesc(ns+"stat_packets_tx_total", "Transmit Packets", labelA, nil),
-		ApTxBytes:           prometheus.NewDesc(ns+"stat_bytes_tx_total", "Transmit Bytes", labelA, nil),
-		ApTxErrors:          prometheus.NewDesc(ns+"stat_errors_tx_total", "Transmit Errors", labelA, nil),
-		ApTxDropped:         prometheus.NewDesc(ns+"stat_dropped_tx_total", "Transmit Dropped", labelA, nil),
+		ApRxErrors:          prometheus.NewDesc(ns+"stat_receive_errors_total", "Receive Errors", labelA, nil),
+		ApRxDropped:         prometheus.NewDesc(ns+"stat_receive_dropped_total", "Receive Dropped", labelA, nil),
+		ApRxFrags:           prometheus.NewDesc(ns+"stat_receive_frags_total", "Received Frags", labelA, nil),
+		ApRxCrypts:          prometheus.NewDesc(ns+"stat_receive_crypts_total", "Receive Crypts", labelA, nil),
+		ApTxPackets:         prometheus.NewDesc(ns+"stat_transmit_packets_total", "Transmit Packets", labelA, nil),
+		ApTxBytes:           prometheus.NewDesc(ns+"stat_transmit_bytes_total", "Transmit Bytes", labelA, nil),
+		ApTxErrors:          prometheus.NewDesc(ns+"stat_transmit_errors_total", "Transmit Errors", labelA, nil),
+		ApTxDropped:         prometheus.NewDesc(ns+"stat_transmit_dropped_total", "Transmit Dropped", labelA, nil),
 		ApTxRetries:         prometheus.NewDesc(ns+"stat_retries_tx_total", "Transmit Retries", labelA, nil),
-		ApRxPackets:         prometheus.NewDesc(ns+"stat_packets_rx_total", "Receive Packets", labelA, nil),
-		ApRxBytes:           prometheus.NewDesc(ns+"stat_bytes_rx_total", "Receive Bytes", labelA, nil),
+		ApRxPackets:         prometheus.NewDesc(ns+"stat_receive_packets_total", "Receive Packets", labelA, nil),
+		ApRxBytes:           prometheus.NewDesc(ns+"stat_receive_bytes_total", "Receive Bytes", labelA, nil),
 		WifiTxAttempts:      prometheus.NewDesc(ns+"stat_wifi_transmit_attempts_total", "Wifi Transmission Attempts", labelA, nil),
 		MacFilterRejections: prometheus.NewDesc(ns+"stat_mac_filter_rejects_total", "MAC Filter Rejections", labelA, nil),
 
@@ -154,61 +154,61 @@ func descUAP(ns string) *uap {
 		VAPCcq:                   prometheus.NewDesc(ns+"vap_ccq", "VAP Client Connection Quality", labelV, nil),
 		VAPMacFilterRejections:   prometheus.NewDesc(ns+"vap_mac_filter_rejects_total", "VAP MAC Filter Rejections", labelV, nil),
 		VAPNumSatisfactionSta:    prometheus.NewDesc(ns+"vap_num_satisfaction_stations", "VAP Number Satisifaction Stations", labelV, nil),
-		VAPAvgClientSignal:       prometheus.NewDesc(ns+"vap_avg_client_signal", "VAP Average Client Signal", labelV, nil),
+		VAPAvgClientSignal:       prometheus.NewDesc(ns+"vap_average_client_signal", "VAP Average Client Signal", labelV, nil),
 		VAPSatisfaction:          prometheus.NewDesc(ns+"vap_satisfaction", "VAP Satisfaction", labelV, nil),
 		VAPSatisfactionNow:       prometheus.NewDesc(ns+"vap_satisfaction_now", "VAP Satisfaction Now", labelV, nil),
-		VAPRxBytes:               prometheus.NewDesc(ns+"vap_bytes_rx_total", "VAP Bytes Received", labelV, nil),
-		VAPRxCrypts:              prometheus.NewDesc(ns+"vap_crypts_rx_total", "VAP Crypts Received", labelV, nil),
-		VAPRxDropped:             prometheus.NewDesc(ns+"vap_dropped_rx_total", "VAP Dropped Received", labelV, nil),
-		VAPRxErrors:              prometheus.NewDesc(ns+"vap_errors_rx_total", "VAP Errors Received", labelV, nil),
-		VAPRxFrags:               prometheus.NewDesc(ns+"vap_frags_rx_total", "VAP Frags Received", labelV, nil),
-		VAPRxNwids:               prometheus.NewDesc(ns+"vap_nwids_rx_total", "VAP Nwids Received", labelV, nil),
-		VAPRxPackets:             prometheus.NewDesc(ns+"vap_packets_rx_total", "VAP Packets Received", labelV, nil),
-		VAPTxBytes:               prometheus.NewDesc(ns+"vap_bytes_tx_total", "VAP Bytes Transmitted", labelV, nil),
-		VAPTxDropped:             prometheus.NewDesc(ns+"vap_dropped_tx_total", "VAP Dropped Transmitted", labelV, nil),
-		VAPTxErrors:              prometheus.NewDesc(ns+"vap_errors_tx_total", "VAP Errors Transmitted", labelV, nil),
-		VAPTxPackets:             prometheus.NewDesc(ns+"vap_packets_tx_total", "VAP Packets Transmitted", labelV, nil),
-		VAPTxPower:               prometheus.NewDesc(ns+"vap_power_tx", "VAP Transmit Power", labelV, nil),
-		VAPTxRetries:             prometheus.NewDesc(ns+"vap_retries_tx_total", "VAP Retries Transmitted", labelV, nil),
-		VAPTxCombinedRetries:     prometheus.NewDesc(ns+"vap_retries_combined_tx_total", "VAP Retries Combined Transmitted", labelV, nil),
-		VAPTxDataMpduBytes:       prometheus.NewDesc(ns+"vap_data_mpdu_bytes_tx_total", "VAP Data MPDU Bytes Transmitted", labelV, nil),
-		VAPTxRtsRetries:          prometheus.NewDesc(ns+"vap_rts_retries_tx_total", "VAP RTS Retries Transmitted", labelV, nil),
-		VAPTxSuccess:             prometheus.NewDesc(ns+"vap_success_tx_total", "VAP Success Transmits", labelV, nil),
-		VAPTxTotal:               prometheus.NewDesc(ns+"vap_tx_total", "VAP Transmit Total", labelV, nil),
-		VAPTxGoodbytes:           prometheus.NewDesc(ns+"vap_goodbyes_tx", "VAP Goodbyes Transmitted", labelV, nil),
-		VAPTxLatAvg:              prometheus.NewDesc(ns+"vap_lat_avg_tx", "VAP Latency Average Transmit", labelV, nil),
-		VAPTxLatMax:              prometheus.NewDesc(ns+"vap_lat_max_tx", "VAP Latency Maximum Transmit", labelV, nil),
-		VAPTxLatMin:              prometheus.NewDesc(ns+"vap_lat_min_tx", "VAP Latency Minimum Transmit", labelV, nil),
-		VAPRxGoodbytes:           prometheus.NewDesc(ns+"vap_goodbyes_rx", "VAP Goodbyes Received", labelV, nil),
-		VAPRxLatAvg:              prometheus.NewDesc(ns+"vap_lat_avg_rx", "VAP Latency Average Receive", labelV, nil),
-		VAPRxLatMax:              prometheus.NewDesc(ns+"vap_lat_max_rx", "VAP Latency Maximum Receive", labelV, nil),
-		VAPRxLatMin:              prometheus.NewDesc(ns+"vap_lat_min_rx", "VAP Latency Minimum Receive", labelV, nil),
-		VAPWifiTxLatencyMovAvg:   prometheus.NewDesc(ns+"vap_latency_tx_mov_avg", "VAP Latency Moving Average Tramsit", labelV, nil),
-		VAPWifiTxLatencyMovMax:   prometheus.NewDesc(ns+"vap_latency_tx_mov_max", "VAP Latency Moving Maximum Tramsit", labelV, nil),
-		VAPWifiTxLatencyMovMin:   prometheus.NewDesc(ns+"vap_latency_tx_mov_min", "VAP Latency Moving Minimum Tramsit", labelV, nil),
-		VAPWifiTxLatencyMovTotal: prometheus.NewDesc(ns+"vap_latency_tx_mov_total", "VAP Latency Moving Total Tramsit", labelV, nil),
-		VAPWifiTxLatencyMovCount: prometheus.NewDesc(ns+"vap_latency_tx_mov_count", "VAP Latency Moving Count Tramsit", labelV, nil),
+		VAPRxBytes:               prometheus.NewDesc(ns+"vap_receive_bytes_total", "VAP Bytes Received", labelV, nil),
+		VAPRxCrypts:              prometheus.NewDesc(ns+"vap_receive_crypts_total", "VAP Crypts Received", labelV, nil),
+		VAPRxDropped:             prometheus.NewDesc(ns+"vap_receive_dropped_total", "VAP Dropped Received", labelV, nil),
+		VAPRxErrors:              prometheus.NewDesc(ns+"vap_receive_errors_total", "VAP Errors Received", labelV, nil),
+		VAPRxFrags:               prometheus.NewDesc(ns+"vap_receive_frags_total", "VAP Frags Received", labelV, nil),
+		VAPRxNwids:               prometheus.NewDesc(ns+"vap_receive_nwids_total", "VAP Nwids Received", labelV, nil),
+		VAPRxPackets:             prometheus.NewDesc(ns+"vap_receive_packets_total", "VAP Packets Received", labelV, nil),
+		VAPTxBytes:               prometheus.NewDesc(ns+"vap_transmit_bytes_total", "VAP Bytes Transmitted", labelV, nil),
+		VAPTxDropped:             prometheus.NewDesc(ns+"vap_transmit_dropped_total", "VAP Dropped Transmitted", labelV, nil),
+		VAPTxErrors:              prometheus.NewDesc(ns+"vap_transmit_errors_total", "VAP Errors Transmitted", labelV, nil),
+		VAPTxPackets:             prometheus.NewDesc(ns+"vap_transmit_packets_total", "VAP Packets Transmitted", labelV, nil),
+		VAPTxPower:               prometheus.NewDesc(ns+"vap_transmit_power", "VAP Transmit Power", labelV, nil),
+		VAPTxRetries:             prometheus.NewDesc(ns+"vap_transmit_retries_total", "VAP Retries Transmitted", labelV, nil),
+		VAPTxCombinedRetries:     prometheus.NewDesc(ns+"vap_transmit_retries_combined_total", "VAP Retries Combined Transmitted", labelV, nil),
+		VAPTxDataMpduBytes:       prometheus.NewDesc(ns+"vap_data_mpdu_transmit_bytes_total", "VAP Data MPDU Bytes Transmitted", labelV, nil),
+		VAPTxRtsRetries:          prometheus.NewDesc(ns+"vap_trnamsit_rts_retries_total", "VAP RTS Retries Transmitted", labelV, nil),
+		VAPTxSuccess:             prometheus.NewDesc(ns+"vap_transmit_success_total", "VAP Success Transmits", labelV, nil),
+		VAPTxTotal:               prometheus.NewDesc(ns+"vap_transmit_total", "VAP Transmit Total", labelV, nil),
+		VAPTxGoodbytes:           prometheus.NewDesc(ns+"vap_transmit_goodbyes", "VAP Goodbyes Transmitted", labelV, nil),
+		VAPTxLatAvg:              prometheus.NewDesc(ns+"vap_transmit_latency_average", "VAP Latency Average Transmit", labelV, nil),
+		VAPTxLatMax:              prometheus.NewDesc(ns+"vap_transmit_latency_maximum", "VAP Latency Maximum Transmit", labelV, nil),
+		VAPTxLatMin:              prometheus.NewDesc(ns+"vap_transmit_latency_minimum", "VAP Latency Minimum Transmit", labelV, nil),
+		VAPRxGoodbytes:           prometheus.NewDesc(ns+"vap_receive_goodbyes", "VAP Goodbyes Received", labelV, nil),
+		VAPRxLatAvg:              prometheus.NewDesc(ns+"vap_receive_latency_average", "VAP Latency Average Receive", labelV, nil),
+		VAPRxLatMax:              prometheus.NewDesc(ns+"vap_receive_latency_maximum", "VAP Latency Maximum Receive", labelV, nil),
+		VAPRxLatMin:              prometheus.NewDesc(ns+"vap_receive_latency_minimum", "VAP Latency Minimum Receive", labelV, nil),
+		VAPWifiTxLatencyMovAvg:   prometheus.NewDesc(ns+"vap_transmit_latency_moving_avg", "VAP Latency Moving Average Tramsit", labelV, nil),
+		VAPWifiTxLatencyMovMax:   prometheus.NewDesc(ns+"vap_transmit_latency_moving_max", "VAP Latency Moving Maximum Tramsit", labelV, nil),
+		VAPWifiTxLatencyMovMin:   prometheus.NewDesc(ns+"vap_transmit_latency_moving_min", "VAP Latency Moving Minimum Tramsit", labelV, nil),
+		VAPWifiTxLatencyMovTotal: prometheus.NewDesc(ns+"vap_transmit_latency_moving_total", "VAP Latency Moving Total Tramsit", labelV, nil),
+		VAPWifiTxLatencyMovCount: prometheus.NewDesc(ns+"vap_transmit_latency_moving_count", "VAP Latency Moving Count Tramsit", labelV, nil),
 
 		// N each - 1 per Radio. 1-4 radios per AP usually
 		RadioCurrentAntennaGain: prometheus.NewDesc(ns+"radio_current_antenna_gain", "Radio Current Antenna Gain", labelR, nil),
 		RadioHt:                 prometheus.NewDesc(ns+"radio_ht", "Radio HT", labelR, nil),
-		RadioMaxTxpower:         prometheus.NewDesc(ns+"radio_max_tx_power", "Radio Maximum Transmit Power", labelR, nil),
-		RadioMinTxpower:         prometheus.NewDesc(ns+"radio_min_tx_power", "Radio Minimum Transmit Power", labelR, nil),
+		RadioMaxTxpower:         prometheus.NewDesc(ns+"radio_max_transmit_power", "Radio Maximum Transmit Power", labelR, nil),
+		RadioMinTxpower:         prometheus.NewDesc(ns+"radio_min_transmit_power", "Radio Minimum Transmit Power", labelR, nil),
 		RadioNss:                prometheus.NewDesc(ns+"radio_nss", "Radio Nss", labelR, nil),
 		RadioRadioCaps:          prometheus.NewDesc(ns+"radio_caps", "Radio Capabilities", labelR, nil),
-		RadioTxPower:            prometheus.NewDesc(ns+"radio_tx_power", "Radio Transmit Power", labelR, nil),
+		RadioTxPower:            prometheus.NewDesc(ns+"radio_transmit_power", "Radio Transmit Power", labelR, nil),
 		RadioAstBeXmit:          prometheus.NewDesc(ns+"radio_ast_be_xmit", "Radio AstBe Transmit", labelR, nil),
 		RadioChannel:            prometheus.NewDesc(ns+"radio_channel", "Radio Channel", labelR, nil),
-		RadioCuSelfRx:           prometheus.NewDesc(ns+"radio_cu_self_rx", "Radio Channel Utilization Receive", labelR, nil),
-		RadioCuSelfTx:           prometheus.NewDesc(ns+"radio_cu_self_tx", "Radio Channel Utilization Transmit", labelR, nil),
-		RadioCuTotal:            prometheus.NewDesc(ns+"radio_cu_total", "Radio Channel Utilization", labelR, nil),
+		RadioCuSelfRx:           prometheus.NewDesc(ns+"radio_channel_utilization_receive", "Radio Channel Utilization Receive", labelR, nil),
+		RadioCuSelfTx:           prometheus.NewDesc(ns+"radio_channel_utilization_transmit", "Radio Channel Utilization Transmit", labelR, nil),
+		RadioCuTotal:            prometheus.NewDesc(ns+"radio_channel_utilization_total", "Radio Channel Utilization", labelR, nil),
 		RadioExtchannel:         prometheus.NewDesc(ns+"radio_ext_channel", "Radio Ext Channel", labelR, nil),
 		RadioGain:               prometheus.NewDesc(ns+"radio_gain", "Radio Gain", labelR, nil),
-		RadioGuestNumSta:        prometheus.NewDesc(ns+"radio_guest_stations_total", "Radio Guest Station Count", labelR, nil),
-		RadioNumSta:             prometheus.NewDesc(ns+"radio_stations_total", "Radio Total Station Count", labelR, nil),
-		RadioUserNumSta:         prometheus.NewDesc(ns+"radio_user_stations_total", "Radio User Station Count", labelR, nil),
-		RadioTxPackets:          prometheus.NewDesc(ns+"radio_packets_tx_total", "Radio Transmitted Packets", labelR, nil),
-		RadioTxRetries:          prometheus.NewDesc(ns+"radio_retries_tx_total", "Radio Transmit Retries", labelR, nil),
+		RadioGuestNumSta:        prometheus.NewDesc(ns+"radio_num_guest_stations_total", "Radio Guest Station Count", labelR, nil),
+		RadioNumSta:             prometheus.NewDesc(ns+"radio_num_stations_total", "Radio Total Station Count", labelR, nil),
+		RadioUserNumSta:         prometheus.NewDesc(ns+"radio_num_user_stations_total", "Radio User Station Count", labelR, nil),
+		RadioTxPackets:          prometheus.NewDesc(ns+"radio_transmit_packets_total", "Radio Transmitted Packets", labelR, nil),
+		RadioTxRetries:          prometheus.NewDesc(ns+"radio_transmit_retries_total", "Radio Transmit Retries", labelR, nil),
 	}
 }
 
diff --git a/promunifi/usg.go b/promunifi/usg.go
index ffa6ad0e..6977ffbf 100644
--- a/promunifi/usg.go
+++ b/promunifi/usg.go
@@ -64,44 +64,44 @@ func descUSG(ns string) *usg {
 
 	return &usg{
 		Uptime:         prometheus.NewDesc(ns+"uptime", "Uptime", labels, nil),
-		TotalTxBytes:   prometheus.NewDesc(ns+"bytes_tx_total", "Total Transmitted Bytes", labels, nil),
-		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_total", "Number of Stations", labels, nil),
-		UserNumSta:     prometheus.NewDesc(ns+"stations_user_total", "Number of User Stations", labels, nil),
-		GuestNumSta:    prometheus.NewDesc(ns+"stations_guest_total", "Number of Guest Stations", labels, nil),
-		NumDesktop:     prometheus.NewDesc(ns+"desktops_total", "Number of Desktops", labels, nil),
-		NumMobile:      prometheus.NewDesc(ns+"mobile_total", "Number of Mobiles", labels, nil),
-		NumHandheld:    prometheus.NewDesc(ns+"handheld_total", "Number of Handhelds", 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),
+		NumSta:         prometheus.NewDesc(ns+"num_stations_total", "Number of Stations", labels, nil),
+		UserNumSta:     prometheus.NewDesc(ns+"num_stations_user_total", "Number of User Stations", labels, nil),
+		GuestNumSta:    prometheus.NewDesc(ns+"num_stations_guest_total", "Number of Guest Stations", labels, nil),
+		NumDesktop:     prometheus.NewDesc(ns+"num_desktops_total", "Number of Desktops", labels, nil),
+		NumMobile:      prometheus.NewDesc(ns+"num_mobile_total", "Number of Mobiles", labels, nil),
+		NumHandheld:    prometheus.NewDesc(ns+"num_handheld_total", "Number of Handhelds", 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),
 		MemUsed:        prometheus.NewDesc(ns+"memory_used_bytes", "System Memory Used", labels, nil),
 		MemTotal:       prometheus.NewDesc(ns+"memory_installed_bytes", "System Installed Memory", labels, nil),
 		MemBuffer:      prometheus.NewDesc(ns+"memory_buffer_bytes", "System Memory Buffer", labels, nil),
-		CPU:            prometheus.NewDesc(ns+"cpu_utilization", "System CPU % Utilized", labels, nil),
-		Mem:            prometheus.NewDesc(ns+"memory_utilization", "System Memory % Utilized", labels, nil), // this may not be %.
-		WanRxPackets:   prometheus.NewDesc(ns+"wan_packets_rx_total", "WAN Receive Packets Total", labelWan, nil),
-		WanRxBytes:     prometheus.NewDesc(ns+"wan_bytes_rx_total", "WAN Receive Bytes Total", labelWan, nil),
-		WanRxDropped:   prometheus.NewDesc(ns+"wan_dropped_rx_total", "WAN Receive Dropped Total", labelWan, nil),
-		WanRxErrors:    prometheus.NewDesc(ns+"wan_errors_rx_total", "WAN Receive Errors Total", labelWan, nil),
-		WanTxPackets:   prometheus.NewDesc(ns+"wan_packets_tx_total", "WAN Transmit Packets Total", labelWan, nil),
-		WanTxBytes:     prometheus.NewDesc(ns+"wan_bytes_tx_total", "WAN Transmit Bytes Total", labelWan, nil),
-		WanRxBroadcast: prometheus.NewDesc(ns+"wan_broadcast_rx_total", "WAN Receive Broadcast Total", labelWan, nil),
-		WanRxBytesR:    prometheus.NewDesc(ns+"wan_bytes_rx_rate", "WAN Receive Bytes Rate", labelWan, nil),
-		WanRxMulticast: prometheus.NewDesc(ns+"wan_ulticast_rx_total", "WAN Receive Multicast Total", labelWan, nil),
+		CPU:            prometheus.NewDesc(ns+"cpu_utilization_percent", "System CPU % Utilized", labels, nil),
+		Mem:            prometheus.NewDesc(ns+"memory_utilization_percent", "System Memory % Utilized", labels, nil),
+		WanRxPackets:   prometheus.NewDesc(ns+"wan_receive_packets_total", "WAN Receive Packets Total", labelWan, nil),
+		WanRxBytes:     prometheus.NewDesc(ns+"wan_receive_bytes_total", "WAN Receive Bytes Total", labelWan, nil),
+		WanRxDropped:   prometheus.NewDesc(ns+"wan_receive_dropped_total", "WAN Receive Dropped Total", labelWan, nil),
+		WanRxErrors:    prometheus.NewDesc(ns+"wan_receive_errors_total", "WAN Receive Errors Total", labelWan, nil),
+		WanTxPackets:   prometheus.NewDesc(ns+"wan_transmit_packets_total", "WAN Transmit Packets Total", labelWan, nil),
+		WanTxBytes:     prometheus.NewDesc(ns+"wan_transmit_bytes_total", "WAN Transmit Bytes Total", labelWan, nil),
+		WanRxBroadcast: prometheus.NewDesc(ns+"wan_receive_broadcast_total", "WAN Receive Broadcast Total", labelWan, nil),
+		WanRxBytesR:    prometheus.NewDesc(ns+"wan_receive_rate_bytes", "WAN Receive Bytes Rate", labelWan, nil),
+		WanRxMulticast: prometheus.NewDesc(ns+"wan_receive_multicast_total", "WAN Receive Multicast Total", labelWan, nil),
 		WanSpeed:       prometheus.NewDesc(ns+"wan_speed", "WAN Speed", labelWan, nil),
-		WanTxBroadcast: prometheus.NewDesc(ns+"wan_broadcast_tx_total", "WAN Transmit Broadcast Total", labelWan, nil),
-		WanTxBytesR:    prometheus.NewDesc(ns+"wan_bytes_tx_rate", "WAN Transmit Bytes Rate", labelWan, nil),
-		WanTxDropped:   prometheus.NewDesc(ns+"wan_dropped_tx_total", "WAN Transmit Dropped Total", labelWan, nil),
-		WanTxErrors:    prometheus.NewDesc(ns+"wan_errors_tx_total", "WAN Transmit Errors Total", labelWan, nil),
-		WanTxMulticast: prometheus.NewDesc(ns+"wan_multicast_tx_total", "WAN Transmit Multicast Total", labelWan, nil),
-		WanBytesR:      prometheus.NewDesc(ns+"wan_bytes_rate", "WAN Transfer Rate", labelWan, nil),
-		LanRxPackets:   prometheus.NewDesc(ns+"lan_packets_rx_total", "LAN Receive Packets Total", labels, nil),
-		LanRxBytes:     prometheus.NewDesc(ns+"lan_bytes_rx_total", "LAN Receive Bytes Total", labels, nil),
-		LanRxDropped:   prometheus.NewDesc(ns+"lan_dropped_rx_total", "LAN Receive Dropped Total", labels, nil),
-		LanTxPackets:   prometheus.NewDesc(ns+"lan_packets_tx_total", "LAN Transmit Packets Total", labels, nil),
-		LanTxBytes:     prometheus.NewDesc(ns+"lan_bytes_tx_total", "LAN Transmit Bytes Total", labels, nil),
+		WanTxBroadcast: prometheus.NewDesc(ns+"wan_transmit_broadcast_total", "WAN Transmit Broadcast Total", labelWan, nil),
+		WanTxBytesR:    prometheus.NewDesc(ns+"wan_transmit_rate_bytes", "WAN Transmit Bytes Rate", labelWan, nil),
+		WanTxDropped:   prometheus.NewDesc(ns+"wan_transmit_dropped_total", "WAN Transmit Dropped Total", labelWan, nil),
+		WanTxErrors:    prometheus.NewDesc(ns+"wan_transmit_errors_total", "WAN Transmit Errors Total", labelWan, nil),
+		WanTxMulticast: prometheus.NewDesc(ns+"wan_transmit_multicast_total", "WAN Transmit Multicast Total", labelWan, nil),
+		WanBytesR:      prometheus.NewDesc(ns+"wan_rate_bytes", "WAN Transfer Rate", labelWan, nil),
+		LanRxPackets:   prometheus.NewDesc(ns+"lan_receive_packets_total", "LAN Receive Packets Total", labels, nil),
+		LanRxBytes:     prometheus.NewDesc(ns+"lan_receive_bytes_total", "LAN Receive Bytes Total", labels, nil),
+		LanRxDropped:   prometheus.NewDesc(ns+"lan_receive_dropped_total", "LAN Receive Dropped Total", labels, nil),
+		LanTxPackets:   prometheus.NewDesc(ns+"lan_transmit_packets_total", "LAN Transmit Packets Total", labels, nil),
+		LanTxBytes:     prometheus.NewDesc(ns+"lan_transmit_bytes_total", "LAN Transmit Bytes Total", labels, nil),
 		Latency:        prometheus.NewDesc(ns+"speedtest_latency", "Speedtest Latency", labels, nil),
 		Runtime:        prometheus.NewDesc(ns+"speedtest_runtime", "Speedtest Run Time", labels, nil),
 		XputDownload:   prometheus.NewDesc(ns+"speedtest_download_rate", "Speedtest Download Rate", labels, nil),
diff --git a/promunifi/usw.go b/promunifi/usw.go
index adae94eb..e6e60f78 100644
--- a/promunifi/usw.go
+++ b/promunifi/usw.go
@@ -84,55 +84,55 @@ func descUSW(ns string) *usw {
 		TotalTxBytes:  prometheus.NewDesc(ns+"bytes_tx_total", "Total Transmitted Bytes", labels, nil),
 		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_total", "Number of Stations", labels, nil),
-		UserNumSta:    prometheus.NewDesc(ns+"stations_user_total", "Number of User Stations", labels, nil),
-		GuestNumSta:   prometheus.NewDesc(ns+"stations_guest_total", "Number of Guest Stations", labels, nil),
+		NumSta:        prometheus.NewDesc(ns+"num_stations_total", "Number of Stations", labels, nil),
+		UserNumSta:    prometheus.NewDesc(ns+"num_stations_user_total", "Number of User Stations", labels, nil),
+		GuestNumSta:   prometheus.NewDesc(ns+"num_stations_guest_total", "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),
 		MemUsed:       prometheus.NewDesc(ns+"memory_used_bytes", "System Memory Used", labels, nil),
 		MemTotal:      prometheus.NewDesc(ns+"memory_installed_bytes", "System Installed Memory", labels, nil),
 		MemBuffer:     prometheus.NewDesc(ns+"memory_buffer_bytes", "System Memory Buffer", labels, nil),
-		CPU:           prometheus.NewDesc(ns+"cpu_utilization", "System CPU % Utilized", labels, nil),
-		Mem:           prometheus.NewDesc(ns+"memory_utilization", "System Memory % Utilized", labels, nil), // this may not be %.
+		CPU:           prometheus.NewDesc(ns+"cpu_utilization_percent", "System CPU % Utilized", labels, nil),
+		Mem:           prometheus.NewDesc(ns+"memory_utilization_percent", "System Memory % Utilized", labels, nil),
 
-		SwRxPackets:   prometheus.NewDesc(ns+"switch_packets_rx_total", "Switch Packets Received Total", labels, nil),
-		SwRxBytes:     prometheus.NewDesc(ns+"switch_bytes_rx_total", "Switch Bytes Received Total", labels, nil),
-		SwRxErrors:    prometheus.NewDesc(ns+"switch_errors_rx_total", "Switch Errors Received Total", labels, nil),
-		SwRxDropped:   prometheus.NewDesc(ns+"switch_dropped_rx_total", "Switch Dropped Received Total", labels, nil),
-		SwRxCrypts:    prometheus.NewDesc(ns+"switch_crypts_rx_total", "Switch Crypts Received Total", labels, nil),
-		SwRxFrags:     prometheus.NewDesc(ns+"switch_frags_rx_total", "Switch Frags Received Total", labels, nil),
-		SwTxPackets:   prometheus.NewDesc(ns+"switch_packets_tx_total", "Switch Packets Transmit Total", labels, nil),
-		SwTxBytes:     prometheus.NewDesc(ns+"switch_bytes_tx_total", "Switch Bytes Transmit Total", labels, nil),
-		SwTxErrors:    prometheus.NewDesc(ns+"switch_errors_tx_total", "Switch Errors Transmit Total", labels, nil),
-		SwTxDropped:   prometheus.NewDesc(ns+"switch_dropped_tx_total", "Switch Dropped Transmit Total", labels, nil),
-		SwTxRetries:   prometheus.NewDesc(ns+"switch_retries_tx_total", "Switch Retries Transmit Total", labels, nil),
-		SwRxMulticast: prometheus.NewDesc(ns+"switch_multicast_rx_total", "Switch Multicast Receive Total", labels, nil),
-		SwRxBroadcast: prometheus.NewDesc(ns+"switch_broadcast_rx_total", "Switch Broadcast Receive Total", labels, nil),
-		SwTxMulticast: prometheus.NewDesc(ns+"switch_multicast_tx_total", "Switch Multicast Transmit Total", labels, nil),
-		SwTxBroadcast: prometheus.NewDesc(ns+"switch_broadcast_tx_total", "Switch Broadcast Transmit Total", labels, nil),
+		SwRxPackets:   prometheus.NewDesc(ns+"switch_receive_packets_total", "Switch Packets Received Total", labels, nil),
+		SwRxBytes:     prometheus.NewDesc(ns+"switch_receive_bytes_total", "Switch Bytes Received Total", labels, nil),
+		SwRxErrors:    prometheus.NewDesc(ns+"switch_receive_errors_total", "Switch Errors Received Total", labels, nil),
+		SwRxDropped:   prometheus.NewDesc(ns+"switch_receive_dropped_total", "Switch Dropped Received Total", labels, nil),
+		SwRxCrypts:    prometheus.NewDesc(ns+"switch_receive_crypts_total", "Switch Crypts Received Total", labels, nil),
+		SwRxFrags:     prometheus.NewDesc(ns+"switch_receive_frags_total", "Switch Frags Received Total", labels, nil),
+		SwTxPackets:   prometheus.NewDesc(ns+"switch_transmit_packets_total", "Switch Packets Transmit Total", labels, nil),
+		SwTxBytes:     prometheus.NewDesc(ns+"switch_transmit_bytes_total", "Switch Bytes Transmit Total", labels, nil),
+		SwTxErrors:    prometheus.NewDesc(ns+"switch_transmit_errors_total", "Switch Errors Transmit Total", labels, nil),
+		SwTxDropped:   prometheus.NewDesc(ns+"switch_transmit_dropped_total", "Switch Dropped Transmit Total", labels, nil),
+		SwTxRetries:   prometheus.NewDesc(ns+"switch_transmit_retries_total", "Switch Retries Transmit Total", labels, nil),
+		SwRxMulticast: prometheus.NewDesc(ns+"switch_receive_multicast_total", "Switch Multicast Receive Total", labels, nil),
+		SwRxBroadcast: prometheus.NewDesc(ns+"switch_receive_broadcast_total", "Switch Broadcast Receive Total", labels, nil),
+		SwTxMulticast: prometheus.NewDesc(ns+"switch_transmit_multicast_total", "Switch Multicast Transmit Total", labels, nil),
+		SwTxBroadcast: prometheus.NewDesc(ns+"switch_transmit_broadcast_total", "Switch Broadcast Transmit Total", labels, nil),
 		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),
-		RxBroadcast:  prometheus.NewDesc(pns+"broadcast_rx_total", "Receive Broadcast", labelP, nil),
-		RxBytes:      prometheus.NewDesc(pns+"bytes_rx_total", "Total Receive Bytes", labelP, nil),
-		RxBytesR:     prometheus.NewDesc(pns+"bytes_rx_rate", "Receive Bytes Rate", labelP, nil),
-		RxDropped:    prometheus.NewDesc(pns+"dropped_rx_total", "Total Receive Dropped", labelP, nil),
-		RxErrors:     prometheus.NewDesc(pns+"errors_rx_total", "Total Receive Errors", labelP, nil),
-		RxMulticast:  prometheus.NewDesc(pns+"multicast_rx_total", "Total Receive Multicast", labelP, nil),
-		RxPackets:    prometheus.NewDesc(pns+"packets_rx_total", "Total Receive Packets", 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),
+		RxDropped:    prometheus.NewDesc(pns+"receive_dropped_total", "Total Receive Dropped", labelP, nil),
+		RxErrors:     prometheus.NewDesc(pns+"receive_errors_total", "Total Receive Errors", labelP, nil),
+		RxMulticast:  prometheus.NewDesc(pns+"receive_multicast_total", "Total Receive Multicast", labelP, nil),
+		RxPackets:    prometheus.NewDesc(pns+"receive_packets_total", "Total Receive Packets", labelP, nil),
 		Satisfaction: prometheus.NewDesc(pns+"satisfaction", "Satisfaction", labelP, nil),
-		Speed:        prometheus.NewDesc(pns+"speed", "Speed", labelP, nil),
-		TxBroadcast:  prometheus.NewDesc(pns+"broadcast_tx_total", "Total Transmit Broadcast", labelP, nil),
-		TxBytes:      prometheus.NewDesc(pns+"bytes_tx_total", "Total Transmit Bytes", labelP, nil),
-		TxBytesR:     prometheus.NewDesc(pns+"bytes_tx_rate", "Transmit Bytes Rate", labelP, nil),
-		TxDropped:    prometheus.NewDesc(pns+"dropped_tx_total", "Total Transmit Dropped", labelP, nil),
-		TxErrors:     prometheus.NewDesc(pns+"errors_tx_total", "Total Transmit Errors", labelP, nil),
-		TxMulticast:  prometheus.NewDesc(pns+"multicast_tx_total", "Total Tranmist Multicast", labelP, nil),
-		TxPackets:    prometheus.NewDesc(pns+"packets_tx_total", "Total Transmit Packets", labelP, nil),
+		Speed:        prometheus.NewDesc(pns+"port_speed", "Speed", labelP, nil),
+		TxBroadcast:  prometheus.NewDesc(pns+"transmit_broadcast_total", "Total Transmit Broadcast", labelP, nil),
+		TxBytes:      prometheus.NewDesc(pns+"transmit_bytes_total", "Total Transmit Bytes", labelP, nil),
+		TxBytesR:     prometheus.NewDesc(pns+"transmit_rate_bytes", "Transmit Bytes Rate", labelP, nil),
+		TxDropped:    prometheus.NewDesc(pns+"transmit_dropped_total", "Total Transmit Dropped", labelP, nil),
+		TxErrors:     prometheus.NewDesc(pns+"transmit_errors_total", "Total Transmit Errors", labelP, nil),
+		TxMulticast:  prometheus.NewDesc(pns+"transmit_multicast_total", "Total Tranmist Multicast", labelP, nil),
+		TxPackets:    prometheus.NewDesc(pns+"transmit_packets_total", "Total Transmit Packets", labelP, nil),
 	}
 }