diff --git a/core/mac/src/pe/include/lim_session.h b/core/mac/src/pe/include/lim_session.h
index 2f7f8f4a89..b9c59beabb 100644
--- a/core/mac/src/pe/include/lim_session.h
+++ b/core/mac/src/pe/include/lim_session.h
@@ -226,7 +226,7 @@ struct pe_session {
 	uint8_t *beacon;        /* Used to store last beacon / probe response before assoc. */
 
 	uint32_t assocReqLen;
-	uint8_t *assocReq;      /* Used to store association request frame sent out while associating. */
+	uint8_t *assoc_req;      /* Used to store association request frame */
 
 	uint32_t assocRspLen;
 	uint8_t *assocRsp;      /* Used to store association response received while associating */
diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
index 0324f48d98..37725ad1f5 100644
--- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
+++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c
@@ -914,7 +914,7 @@ static void lim_process_mlm_assoc_req(struct mac_context *mac_ctx, uint32_t *msg
 end:
 	/* Update PE session Id */
 	mlm_assoc_cnf.sessionId = mlm_assoc_req->sessionId;
-	/* Free up buffer allocated for assocReq */
+	/* Free up buffer allocated for assoc_req */
 	qdf_mem_free(mlm_assoc_req);
 	lim_post_sme_message(mac_ctx, LIM_MLM_ASSOC_CNF,
 			     (uint32_t *) &mlm_assoc_cnf);
diff --git a/core/mac/src/pe/lim/lim_send_frames_host_roam.c b/core/mac/src/pe/lim/lim_send_frames_host_roam.c
index 0c1607d982..ae349789b7 100644
--- a/core/mac/src/pe/lim/lim_send_frames_host_roam.c
+++ b/core/mac/src/pe/lim/lim_send_frames_host_roam.c
@@ -370,9 +370,9 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(struct mac_context *mac_ctx,
 	pe_debug("*** Sending Re-Assoc Request length: %d %d to",
 		       bytes, payload);
 
-	if (pe_session->assocReq) {
-		qdf_mem_free(pe_session->assocReq);
-		pe_session->assocReq = NULL;
+	if (pe_session->assoc_req) {
+		qdf_mem_free(pe_session->assoc_req);
+		pe_session->assoc_req = NULL;
 		pe_session->assocReqLen = 0;
 	}
 
@@ -382,13 +382,13 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(struct mac_context *mac_ctx,
 		payload += add_ie_len;
 	}
 
-	pe_session->assocReq = qdf_mem_malloc(payload);
-	if (pe_session->assocReq) {
+	pe_session->assoc_req = qdf_mem_malloc(payload);
+	if (pe_session->assoc_req) {
 		/*
 		 * Store the Assoc request. This is sent to csr/hdd in
 		 * join cnf response.
 		 */
-		qdf_mem_copy(pe_session->assocReq,
+		qdf_mem_copy(pe_session->assoc_req,
 			     frame + sizeof(tSirMacMgmtHdr), payload);
 		pe_session->assocReqLen = payload;
 	}
@@ -416,22 +416,23 @@ void lim_send_reassoc_req_with_ft_ies_mgmt_frame(struct mac_context *mac_ctx,
 		 pe_session->opmode == QDF_P2P_GO_MODE)
 		tx_flag |= HAL_USE_BD_RATE2_FOR_MANAGEMENT_FRAME;
 
-	if (pe_session->assocReq) {
-		qdf_mem_free(pe_session->assocReq);
-		pe_session->assocReq = NULL;
+	if (pe_session->assoc_req) {
+		qdf_mem_free(pe_session->assoc_req);
+		pe_session->assoc_req = NULL;
 		pe_session->assocReqLen = 0;
 	}
 	if (ft_ies_length) {
-		pe_session->assocReq = qdf_mem_malloc(ft_ies_length);
-		if (!pe_session->assocReq) {
+		pe_session->assoc_req = qdf_mem_malloc(ft_ies_length);
+		if (!pe_session->assoc_req) {
 			pe_session->assocReqLen = 0;
 		} else {
 			/*
 			 * Store the FT IEs. This is sent to csr/hdd in
 			 * join cnf response.
 			 */
-			qdf_mem_copy(pe_session->assocReq,
-				ft_sme_context->reassoc_ft_ies, ft_ies_length);
+			qdf_mem_copy(pe_session->assoc_req,
+				     ft_sme_context->reassoc_ft_ies,
+				     ft_ies_length);
 			pe_session->assocReqLen = ft_ies_length;
 		}
 	} else {
@@ -741,9 +742,9 @@ void lim_send_reassoc_req_mgmt_frame(struct mac_context *mac,
 
 	pe_debug("*** Sending Re-Association Request length: %d" "to", nBytes);
 
-	if (pe_session->assocReq) {
-		qdf_mem_free(pe_session->assocReq);
-		pe_session->assocReq = NULL;
+	if (pe_session->assoc_req) {
+		qdf_mem_free(pe_session->assoc_req);
+		pe_session->assoc_req = NULL;
 		pe_session->assocReqLen = 0;
 	}
 
@@ -753,10 +754,10 @@ void lim_send_reassoc_req_mgmt_frame(struct mac_context *mac,
 		nPayload += nAddIELen;
 	}
 
-	pe_session->assocReq = qdf_mem_malloc(nPayload);
-	if (pe_session->assocReq) {
+	pe_session->assoc_req = qdf_mem_malloc(nPayload);
+	if (pe_session->assoc_req) {
 		/* Store the Assocrequest. It is sent to csr in joincnfrsp */
-		qdf_mem_copy(pe_session->assocReq,
+		qdf_mem_copy(pe_session->assoc_req,
 			     pFrame + sizeof(tSirMacMgmtHdr), nPayload);
 		pe_session->assocReqLen = nPayload;
 	}
diff --git a/core/mac/src/pe/lim/lim_send_management_frames.c b/core/mac/src/pe/lim/lim_send_management_frames.c
index 9ac12f21e3..de1a13b63e 100644
--- a/core/mac/src/pe/lim/lim_send_management_frames.c
+++ b/core/mac/src/pe/lim/lim_send_management_frames.c
@@ -1205,7 +1205,7 @@ lim_send_assoc_rsp_mgmt_frame(
 		assoc_req = (tpSirAssocReq)
 			pe_session->parsedAssocReq[sta->assocId];
 		/*
-		 * populate P2P IE in AssocRsp when assocReq from the peer
+		 * populate P2P IE in AssocRsp when assoc_req from the peer
 		 * includes P2P IE
 		 */
 		if (assoc_req && assoc_req->addIEPresent)
@@ -2283,9 +2283,9 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
 		     adaptive_11r_ie, adaptive_11r_ie_len);
 	payload = payload + adaptive_11r_ie_len;
 
-	if (pe_session->assocReq) {
-		qdf_mem_free(pe_session->assocReq);
-		pe_session->assocReq = NULL;
+	if (pe_session->assoc_req) {
+		qdf_mem_free(pe_session->assoc_req);
+		pe_session->assoc_req = NULL;
 		pe_session->assocReqLen = 0;
 	}
 
@@ -2298,13 +2298,13 @@ lim_send_assoc_req_mgmt_frame(struct mac_context *mac_ctx,
 		}
 	}
 
-	pe_session->assocReq = qdf_mem_malloc(payload);
-	if (pe_session->assocReq) {
+	pe_session->assoc_req = qdf_mem_malloc(payload);
+	if (pe_session->assoc_req) {
 		/*
 		 * Store the Assoc request. This is sent to csr/hdd in
 		 * join cnf response.
 		 */
-		qdf_mem_copy(pe_session->assocReq,
+		qdf_mem_copy(pe_session->assoc_req,
 			     frame + sizeof(tSirMacMgmtHdr), payload);
 		pe_session->assocReqLen = payload;
 	}
diff --git a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
index 95bcbcd976..26056eb4b7 100644
--- a/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
+++ b/core/mac/src/pe/lim/lim_send_sme_rsp_messages.c
@@ -203,15 +203,15 @@ static void lim_handle_join_rsp_status(struct mac_context *mac_ctx,
 			sme_join_rsp->beaconLength);
 	}
 
-	if (session_entry->assocReq) {
+	if (session_entry->assoc_req) {
 		sme_join_rsp->assocReqLength =
 			session_entry->assocReqLen;
 		qdf_mem_copy(sme_join_rsp->frames +
 			     sme_join_rsp->beaconLength,
-			     session_entry->assocReq,
+			     session_entry->assoc_req,
 			     sme_join_rsp->assocReqLength);
-		qdf_mem_free(session_entry->assocReq);
-		session_entry->assocReq = NULL;
+		qdf_mem_free(session_entry->assoc_req);
+		session_entry->assoc_req = NULL;
 		session_entry->assocReqLen = 0;
 		pe_debug("AssocReq: %d",
 			sme_join_rsp->assocReqLength);
@@ -325,9 +325,9 @@ static void lim_handle_join_rsp_status(struct mac_context *mac_ctx,
 			session_entry->beacon = NULL;
 			session_entry->bcnLen = 0;
 		}
-		if (session_entry->assocReq) {
-			qdf_mem_free(session_entry->assocReq);
-			session_entry->assocReq = NULL;
+		if (session_entry->assoc_req) {
+			qdf_mem_free(session_entry->assoc_req);
+			session_entry->assoc_req = NULL;
 			session_entry->assocReqLen = 0;
 		}
 		if (session_entry->assocRsp) {
diff --git a/core/mac/src/pe/lim/lim_session.c b/core/mac/src/pe/lim/lim_session.c
index 3a80800b4e..93200f7257 100644
--- a/core/mac/src/pe/lim/lim_session.c
+++ b/core/mac/src/pe/lim/lim_session.c
@@ -883,9 +883,9 @@ void pe_delete_session(struct mac_context *mac_ctx, struct pe_session *session)
 		session->bcnLen = 0;
 	}
 
-	if (session->assocReq) {
-		qdf_mem_free(session->assocReq);
-		session->assocReq = NULL;
+	if (session->assoc_req) {
+		qdf_mem_free(session->assoc_req);
+		session->assoc_req = NULL;
 		session->assocReqLen = 0;
 	}