diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index 531a53f45a6a..f3a212bcf06d 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -773,7 +773,7 @@ struct hdd_fw_txrx_stats {
  * @ucSTAId: Station ID reported back from HAL (through SAP).
  *           Broadcast uses station ID zero by default.
  * @staType: Type of station i.e. p2p client or infrastructure station
- * @macAddrSTA: MAC address of the station
+ * @sta_mac: MAC address of the station
  * @peer_state: Current Station state so HDD knows how to deal with packet
  *              queue. Most recent states used to change TLSHIM STA state.
  * @is_qos_enabled: Track QoS status of station
@@ -806,7 +806,7 @@ struct hdd_station_info {
 	bool in_use;
 	uint8_t ucSTAId;
 	eStationType staType;
-	struct qdf_mac_addr macAddrSTA;
+	struct qdf_mac_addr sta_mac;
 	enum ol_txrx_peer_state peer_state;
 	bool is_qos_enabled;
 	bool is_deauth_in_progress;
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index a529428309a1..daaf40196844 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -4817,7 +4817,7 @@ static struct hdd_station_info *hdd_get_stainfo(struct hdd_adapter *adapter,
 	int i;
 
 	for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
-		if (!qdf_mem_cmp(&adapter->aStaInfo[i].macAddrSTA,
+		if (!qdf_mem_cmp(&adapter->aStaInfo[i].sta_mac,
 				 &mac_addr,
 				 QDF_MAC_ADDR_SIZE))
 			stainfo = &adapter->aStaInfo[i];
@@ -7896,9 +7896,9 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 		for (sta_id = 0; sta_id < WLAN_MAX_STA_COUNT; sta_id++) {
 			if (adapter->aStaInfo[sta_id].in_use &&
 			    !qdf_is_macaddr_broadcast(
-				&adapter->aStaInfo[sta_id].macAddrSTA) &&
+				&adapter->aStaInfo[sta_id].sta_mac) &&
 			    !qdf_mem_cmp(
-				&adapter->aStaInfo[sta_id].macAddrSTA.bytes,
+				&adapter->aStaInfo[sta_id].sta_mac.bytes,
 				peer_mac, QDF_MAC_ADDR_SIZE))
 				break;
 		}
@@ -18256,7 +18256,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 					qdf_mem_copy(
 						mac,
 						adapter->aStaInfo[i].
-							macAddrSTA.bytes,
+							sta_mac.bytes,
 						QDF_MAC_ADDR_SIZE);
 					if (hdd_ipa_uc_is_enabled(hdd_ctx)) {
 						hdd_ipa_wlan_evt(adapter,
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index 0ee95c8b9656..eb8b25ddf0a7 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -675,7 +675,7 @@ static void hdd_clear_all_sta(struct hdd_adapter *adapter,
 		    (staId !=
 		     (WLAN_HDD_GET_AP_CTX_PTR(adapter))->uBCStaId)) {
 			wlansap_populate_del_sta_params(
-				&adapter->aStaInfo[staId].macAddrSTA.
+				&adapter->aStaInfo[staId].sta_mac.
 				bytes[0], eSIR_MAC_DEAUTH_LEAVING_BSS_REASON,
 				(SIR_MAC_MGMT_DISASSOC >> 4), &del_sta_params);
 
@@ -4490,8 +4490,8 @@ static __iw_softap_getassoc_stamacaddr(struct net_device *dev,
 	spin_lock_bh(&adapter->staInfo_lock);
 	while ((cnt < WLAN_MAX_STA_COUNT) && (left >= QDF_MAC_ADDR_SIZE)) {
 		if ((pStaInfo[cnt].in_use) &&
-		    (!IS_BROADCAST_MAC(pStaInfo[cnt].macAddrSTA.bytes))) {
-			memcpy(&buf[maclist_index], &(pStaInfo[cnt].macAddrSTA),
+		    (!IS_BROADCAST_MAC(pStaInfo[cnt].sta_mac.bytes))) {
+			memcpy(&buf[maclist_index], &(pStaInfo[cnt].sta_mac),
 			       QDF_MAC_ADDR_SIZE);
 			maclist_index += QDF_MAC_ADDR_SIZE;
 			left -= QDF_MAC_ADDR_SIZE;
@@ -5138,12 +5138,12 @@ static int hdd_softap_get_sta_info(struct hdd_adapter *adapter,
 		written += scnprintf(buf + written, size - written,
 				     "%5d %02x:%02x:%02x:%02x:%02x:%02x ecsa=%d\n",
 				     sta->ucSTAId,
-				     sta->macAddrSTA.bytes[0],
-				     sta->macAddrSTA.bytes[1],
-				     sta->macAddrSTA.bytes[2],
-				     sta->macAddrSTA.bytes[3],
-				     sta->macAddrSTA.bytes[4],
-				     sta->macAddrSTA.bytes[5],
+				     sta->sta_mac.bytes[0],
+				     sta->sta_mac.bytes[1],
+				     sta->sta_mac.bytes[2],
+				     sta->sta_mac.bytes[3],
+				     sta->sta_mac.bytes[4],
+				     sta->sta_mac.bytes[5],
 				     sta->ecsa_capable);
 	}
 
@@ -5260,11 +5260,11 @@ int __iw_get_softap_linkspeed(struct net_device *dev,
 		for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
 			if (adapter->aStaInfo[i].in_use &&
 			    (!qdf_is_macaddr_broadcast
-				  (&adapter->aStaInfo[i].macAddrSTA))) {
+				  (&adapter->aStaInfo[i].sta_mac))) {
 				qdf_copy_macaddr(
 					&macAddress,
 					&adapter->aStaInfo[i].
-					 macAddrSTA);
+					 sta_mac);
 				status = QDF_STATUS_SUCCESS;
 				break;
 			}
@@ -8840,14 +8840,14 @@ void hdd_sap_indicate_disconnect_for_sta(struct hdd_adapter *adapter)
 				 adapter);
 
 			if (qdf_is_macaddr_broadcast(
-				&adapter->aStaInfo[sta_id].macAddrSTA))
+				&adapter->aStaInfo[sta_id].sta_mac))
 				continue;
 
 			sap_event.sapHddEventCode = eSAP_STA_DISASSOC_EVENT;
 			qdf_mem_copy(
 				&sap_event.sapevt.
 				sapStationDisassocCompleteEvent.staMac,
-				&adapter->aStaInfo[sta_id].macAddrSTA,
+				&adapter->aStaInfo[sta_id].sta_mac,
 				sizeof(struct qdf_mac_addr));
 			sap_event.sapevt.sapStationDisassocCompleteEvent.
 			reason =
diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c
index 9b8c6498bc6f..54f4c7302710 100644
--- a/core/hdd/src/wlan_hdd_ipa.c
+++ b/core/hdd/src/wlan_hdd_ipa.c
@@ -3060,13 +3060,13 @@ static int hdd_ipa_uc_disconnect_client(struct hdd_adapter *adapter)
 
 	HDD_IPA_LOG(QDF_TRACE_LEVEL_FATAL, "enter");
 	for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
-		if (qdf_is_macaddr_broadcast(&adapter->aStaInfo[i].macAddrSTA))
+		if (qdf_is_macaddr_broadcast(&adapter->aStaInfo[i].sta_mac))
 			continue;
 		if ((adapter->aStaInfo[i].in_use) &&
 		   (!adapter->aStaInfo[i].is_deauth_in_progress) &&
 		   hdd_ipa->sap_num_connected_sta) {
 			hdd_ipa_uc_send_evt(adapter, WLAN_CLIENT_DISCONNECT,
-				adapter->aStaInfo[i].macAddrSTA.bytes);
+				adapter->aStaInfo[i].sta_mac.bytes);
 			hdd_ipa->sap_num_connected_sta--;
 		}
 	}
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 74b177a8efa8..8c6c3724ecc9 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -12413,7 +12413,7 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
 
 				sta_mac = (uint8_t *)
 						&(adapter->aStaInfo[sta_id].
-							macAddrSTA.bytes[0]);
+							sta_mac.bytes[0]);
 				hdd_debug("client " MAC_ADDRESS_STR
 				" of SAP/GO is in middle of WPS/EAPOL exchange",
 				MAC_ADDR_ARRAY(sta_mac));
diff --git a/core/hdd/src/wlan_hdd_softap_tx_rx.c b/core/hdd/src/wlan_hdd_softap_tx_rx.c
index 3cde6d088809..f906eddd950d 100644
--- a/core/hdd/src/wlan_hdd_softap_tx_rx.c
+++ b/core/hdd/src/wlan_hdd_softap_tx_rx.c
@@ -646,7 +646,7 @@ QDF_STATUS hdd_softap_init_tx_rx_sta(struct hdd_adapter *adapter,
 
 	adapter->aStaInfo[sta_id].in_use = true;
 	adapter->aStaInfo[sta_id].is_deauth_in_progress = false;
-	qdf_copy_macaddr(&adapter->aStaInfo[sta_id].macAddrSTA, sta_mac);
+	qdf_copy_macaddr(&adapter->aStaInfo[sta_id].sta_mac, sta_mac);
 
 	spin_unlock_bh(&adapter->staInfo_lock);
 	return QDF_STATUS_SUCCESS;
@@ -855,10 +855,10 @@ QDF_STATUS hdd_softap_deregister_sta(struct hdd_adapter *adapter,
 
 	ret = hdd_objmgr_remove_peer_object(adapter->hdd_vdev,
 					    adapter->aStaInfo[staId].
-						macAddrSTA.bytes);
+						sta_mac.bytes);
 	if (ret)
 		hdd_err("Peer obj %pM delete fails",
-			adapter->aStaInfo[staId].macAddrSTA.bytes);
+			adapter->aStaInfo[staId].sta_mac.bytes);
 
 	if (adapter->aStaInfo[staId].in_use) {
 		spin_lock_bh(&adapter->staInfo_lock);
@@ -1094,7 +1094,7 @@ QDF_STATUS hdd_softap_change_sta_state(struct hdd_adapter *adapter,
 	}
 
 	if (false ==
-	    qdf_is_macaddr_equal(&adapter->aStaInfo[ucSTAId].macAddrSTA,
+	    qdf_is_macaddr_equal(&adapter->aStaInfo[ucSTAId].sta_mac,
 				 pDestMacAddress)) {
 		hdd_err("Station %u MAC address not matching", ucSTAId);
 		return QDF_STATUS_E_FAILURE;
@@ -1132,7 +1132,7 @@ QDF_STATUS hdd_softap_get_sta_id(struct hdd_adapter *adapter,
 
 	for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
 		if (!qdf_mem_cmp
-			(&adapter->aStaInfo[i].macAddrSTA, pMacAddress,
+			(&adapter->aStaInfo[i].sta_mac, pMacAddress,
 			QDF_MAC_ADDR_SIZE) && adapter->aStaInfo[i].in_use) {
 			*staId = i;
 			return QDF_STATUS_SUCCESS;
diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c
index 4ab99f1f5266..533e11a18eec 100644
--- a/core/hdd/src/wlan_hdd_stats.c
+++ b/core/hdd/src/wlan_hdd_stats.c
@@ -3835,7 +3835,7 @@ int wlan_hdd_get_station_remote(struct wiphy *wiphy,
 	hdd_debug("get peer %pM info", mac);
 
 	for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
-		if (!qdf_mem_cmp(adapter->aStaInfo[i].macAddrSTA.bytes,
+		if (!qdf_mem_cmp(adapter->aStaInfo[i].sta_mac.bytes,
 				 mac,
 				 QDF_MAC_ADDR_SIZE)) {
 			stainfo = &adapter->aStaInfo[i];
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index 59b8aed4a413..7781323e4228 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -4494,7 +4494,7 @@ int hdd_set_peer_rate(struct hdd_adapter *adapter, int set_value)
 	if ((adapter->aStaInfo[aid].in_use) &&
 	    (OL_TXRX_PEER_STATE_CONN == adapter->aStaInfo[aid].peer_state)) {
 		peer_mac =
-		    (uint8_t *)&(adapter->aStaInfo[aid].macAddrSTA.bytes[0]);
+		    (uint8_t *)&(adapter->aStaInfo[aid].sta_mac.bytes[0]);
 		hdd_info("Peer AID: %d MAC_ADDR: "MAC_ADDRESS_STR,
 			 aid, MAC_ADDR_ARRAY(peer_mac));
 	} else {