diff --git a/core/hdd/inc/wlan_hdd_wmm.h b/core/hdd/inc/wlan_hdd_wmm.h
index 88c53ca7c61f..e90010a8b626 100644
--- a/core/hdd/inc/wlan_hdd_wmm.h
+++ b/core/hdd/inc/wlan_hdd_wmm.h
@@ -142,7 +142,7 @@ struct hdd_wmm_qos_context {
  *	are not doing WMM, we are not doing implicit QoS, implict QoS has
  *	completed, or explicit QoS has completed?
  * @is_tspec_valid - is the wmmAcTspecInfo valid?
- * @wmmAcUapsdInfoValid - are the wmmAcUapsd* fields valid?
+ * @is_uapsd_info_valid - are the UAPSD-related fields valid?
  * @wmmAcTspecInfo - current (possibly aggregate) Tspec for this AC
  * @wmmAcIsUapsdEnabled - is UAPSD enabled on this AC?
  * @wmmAcUapsdServiceInterval - service interval for this AC
@@ -160,7 +160,7 @@ struct hdd_wmm_ac_status {
 	bool was_access_granted;
 	bool is_access_allowed;
 	bool is_tspec_valid;
-	bool wmmAcUapsdInfoValid;
+	bool is_uapsd_info_valid;
 	struct sme_qos_wmmtspecinfo wmmAcTspecInfo;
 	bool wmmAcIsUapsdEnabled;
 	uint32_t wmmAcUapsdServiceInterval;
diff --git a/core/hdd/src/wlan_hdd_wmm.c b/core/hdd/src/wlan_hdd_wmm.c
index 3f53dae5c9e6..888da5e80467 100644
--- a/core/hdd/src/wlan_hdd_wmm.c
+++ b/core/hdd/src/wlan_hdd_wmm.c
@@ -149,7 +149,7 @@ static void hdd_wmm_enable_tl_uapsd(struct hdd_wmm_qos_context *qos_context)
 	psb = ac->wmmAcTspecInfo.ts_info.psb;
 
 	/* if we have previously enabled U-APSD, have any params changed? */
-	if ((ac->wmmAcUapsdInfoValid) &&
+	if ((ac->is_uapsd_info_valid) &&
 	    (ac->wmmAcUapsdServiceInterval == service_interval) &&
 	    (ac->wmmAcUapsdSuspensionInterval == suspension_interval) &&
 	    (ac->wmmAcUapsdDirection == direction) &&
@@ -175,7 +175,7 @@ static void hdd_wmm_enable_tl_uapsd(struct hdd_wmm_qos_context *qos_context)
 		return;
 	}
 	/* stash away the parameters that were used */
-	ac->wmmAcUapsdInfoValid = true;
+	ac->is_uapsd_info_valid = true;
 	ac->wmmAcUapsdServiceInterval = service_interval;
 	ac->wmmAcUapsdSuspensionInterval = suspension_interval;
 	ac->wmmAcUapsdDirection = direction;
@@ -202,7 +202,7 @@ static void hdd_wmm_disable_tl_uapsd(struct hdd_wmm_qos_context *qos_context)
 	QDF_STATUS status;
 
 	/* have we previously enabled UAPSD? */
-	if (ac->wmmAcUapsdInfoValid == true) {
+	if (ac->is_uapsd_info_valid == true) {
 		status =
 			sme_disable_uapsd_for_ac((WLAN_HDD_GET_STATION_CTX_PTR
 							     (adapter))->conn_info.sta_id[0],
@@ -212,7 +212,7 @@ static void hdd_wmm_disable_tl_uapsd(struct hdd_wmm_qos_context *qos_context)
 			hdd_err("Failed to disable U-APSD for AC=%d", ac_type);
 		} else {
 			/* TL no longer has valid UAPSD info */
-			ac->wmmAcUapsdInfoValid = false;
+			ac->is_uapsd_info_valid = false;
 			hdd_debug("Disabled UAPSD in TL for AC=%d", ac_type);
 		}
 	}
@@ -1522,7 +1522,7 @@ QDF_STATUS hdd_wmm_adapter_init(struct hdd_adapter *adapter)
 		ac_status->was_access_granted = false;
 		ac_status->is_access_allowed = false;
 		ac_status->is_tspec_valid = false;
-		ac_status->wmmAcUapsdInfoValid = false;
+		ac_status->is_uapsd_info_valid = false;
 	}
 	/* Invalid value(0xff) to indicate psb not configured through
 	 * framework initially.
@@ -1555,7 +1555,7 @@ QDF_STATUS hdd_wmm_adapter_clear(struct hdd_adapter *adapter)
 		ac_status->was_access_granted = false;
 		ac_status->is_access_allowed = false;
 		ac_status->is_tspec_valid = false;
-		ac_status->wmmAcUapsdInfoValid = false;
+		ac_status->is_uapsd_info_valid = false;
 	}
 	return QDF_STATUS_SUCCESS;
 }