diff --git a/promunifi/clients.go b/promunifi/clients.go
index e3c973b1..5dcfad2d 100644
--- a/promunifi/clients.go
+++ b/promunifi/clients.go
@@ -63,8 +63,8 @@ func descClient(ns string) *client {
 		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+"tx_power", "Client Transmit Power", labels, nil),
-		TxRate:            prometheus.NewDesc(ns+"tx_rate", "Client Transmit Rate", labels, nil),
+		TxPower:           prometheus.NewDesc(ns+"radio_tx_power", "Client Transmit Power", labels, nil),
+		TxRate:            prometheus.NewDesc(ns+"bytes_tx_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),
diff --git a/promunifi/uap.go b/promunifi/uap.go
index 9d42e095..c1f3872b 100644
--- a/promunifi/uap.go
+++ b/promunifi/uap.go
@@ -81,8 +81,8 @@ func descUAP(ns string) *uap {
 
 	return &uap{
 		Uptime:       prometheus.NewDesc(ns+"uptime", "Uptime", labels, nil),
-		TotalTxBytes: prometheus.NewDesc(ns+"tx_bytes_total", "Total Transmitted Bytes", labels, nil),
-		TotalRxBytes: prometheus.NewDesc(ns+"rx_bytes_total", "Total Received Bytes", 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 Transfered", 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),