diff --git a/core/unifi/udm_type.go b/core/unifi/udm_type.go
index 1ce60d30..5d4b1858 100644
--- a/core/unifi/udm_type.go
+++ b/core/unifi/udm_type.go
@@ -180,6 +180,6 @@ type UDM struct {
 // UDMStat holds the "stat" data for a dream machine.
 // A dream machine is a USG + USW + Controller
 type UDMStat struct {
-	*Gw
-	*Sw
+	*Gw `json:"gw"`
+	*Sw `json:"sw"`
 }
diff --git a/core/unifi/usw_type.go b/core/unifi/usw_type.go
index 47516d43..04b4c070 100644
--- a/core/unifi/usw_type.go
+++ b/core/unifi/usw_type.go
@@ -163,7 +163,7 @@ type USWStat struct {
 	*Sw
 }
 
-// GS is a subtype of USWStat to make unmarshalling of different controller versions possible.
+// Sw is a subtype of USWStat to make unmarshalling of different controller versions possible.
 type Sw struct {
 	SiteID            string    `json:"site_id"`
 	O                 string    `json:"o"`