diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index c3a0bf797b32..db26db4ba67b 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -640,7 +640,7 @@ struct hdd_mon_set_ch_info {
  *    @ibss_enc_key_installed is %true)
  * @ibss_peer_info: information about the ibss peer
  * @hdd_reassoc_scenario: is station in the middle of reassociation?
- * @staDebugState: STA context debug variable
+ * @sta_debug_state: STA context debug variable
  * @broadcast_staid: STA ID assigned for broadcast frames
  * @ch_info: monitor mode channel information
  * @ndp_ctx: NAN data path context
@@ -659,7 +659,7 @@ struct hdd_station_ctx {
 	tCsrRoamSetKey ibss_enc_key;
 	tSirPeerInfoRspParams ibss_peer_info;
 	bool hdd_reassoc_scenario;
-	int staDebugState;
+	int sta_debug_state;
 	uint8_t broadcast_staid;
 	struct hdd_mon_set_ch_info ch_info;
 #if defined(WLAN_FEATURE_NAN_DATAPATH) && !defined(WLAN_FEATURE_NAN_CONVERGENCE)
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index d15273e6e92e..5d96917df401 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -17004,7 +17004,7 @@ int wlan_hdd_try_disconnect(struct hdd_adapter *adapter)
 		} else if (0 != status) {
 			hdd_err("sme_roam_disconnect failure, status: %d",
 				(int)status);
-			sta_ctx->staDebugState = status;
+			sta_ctx->sta_debug_state = status;
 			result = -EINVAL;
 			goto disconnected;
 		}
@@ -17013,8 +17013,8 @@ int wlan_hdd_try_disconnect(struct hdd_adapter *adapter)
 			&adapter->disconnect_comp_var,
 			msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT));
 		if (!rc && (QDF_STATUS_CMD_NOT_QUEUED != status)) {
-			hdd_err("Sme disconnect event timed out session Id: %d staDebugState: %d",
-				adapter->sessionId, sta_ctx->staDebugState);
+			hdd_err("Sme disconnect event timed out session Id: %d sta_debug_state: %d",
+				adapter->sessionId, sta_ctx->sta_debug_state);
 			result = -ETIMEDOUT;
 		}
 	} else if (eConnectionState_Disconnecting ==
@@ -17022,8 +17022,8 @@ int wlan_hdd_try_disconnect(struct hdd_adapter *adapter)
 		rc = wait_for_completion_timeout(&adapter->disconnect_comp_var,
 				msecs_to_jiffies(WLAN_WAIT_TIME_DISCONNECT));
 		if (!rc) {
-			hdd_err("Disconnect event timed out session Id: %d staDebugState: %d",
-				adapter->sessionId, sta_ctx->staDebugState);
+			hdd_err("Disconnect event timed out session Id: %d sta_debug_state: %d",
+				adapter->sessionId, sta_ctx->sta_debug_state);
 			result = -ETIMEDOUT;
 		}
 	}
@@ -17420,7 +17420,7 @@ static int wlan_hdd_disconnect(struct hdd_adapter *adapter, u16 reason)
 		hdd_debug("Already disconnected or connect was in sme/roam pending list and removed by disconnect");
 	} else if (0 != status) {
 		hdd_err("csr_roam_disconnect failure, status: %d", (int)status);
-		sta_ctx->staDebugState = status;
+		sta_ctx->sta_debug_state = status;
 		result = -EINVAL;
 		goto disconnected;
 	}