diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c
index c0ef6f0139..11cf366922 100644
--- a/core/hdd/src/wlan_hdd_ioctl.c
+++ b/core/hdd/src/wlan_hdd_ioctl.c
@@ -2504,7 +2504,7 @@ done:
 /**
  * hdd_parse_ese_beacon_req() - Parse ese beacon request
  * @command: Pointer to data
- * @pEseBcnReq:	Output pointer to store parsed ie information
+ * @req:	Output pointer to store parsed ie information
  *
  * This function parses the ese beacon request passed in the format
  * CCXBEACONREQ<space><Number of fields><space><Measurement token>
@@ -2521,7 +2521,7 @@ done:
  * Return: 0 for success non-zero for failure
  */
 static int hdd_parse_ese_beacon_req(uint8_t *command,
-				    tCsrEseBeaconReq *pEseBcnReq)
+				    tCsrEseBeaconReq *req)
 {
 	uint8_t *inPtr = command;
 	uint8_t input = 0;
@@ -2553,11 +2553,11 @@ static int hdd_parse_ese_beacon_req(uint8_t *command,
 		return -EINVAL;
 
 	input = QDF_MIN(input, SIR_ESE_MAX_MEAS_IE_REQS);
-	pEseBcnReq->numBcnReqIe = input;
+	req->numBcnReqIe = input;
 
-	hdd_debug("Number of Bcn Req Ie fields: %d", pEseBcnReq->numBcnReqIe);
+	hdd_debug("Number of Bcn Req Ie fields: %d", req->numBcnReqIe);
 
-	for (j = 0; j < (pEseBcnReq->numBcnReqIe); j++) {
+	for (j = 0; j < (req->numBcnReqIe); j++) {
 		for (i = 0; i < 4; i++) {
 			/*
 			 * inPtr pointing to the beginning of 1st space
@@ -2595,7 +2595,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *command,
 						  tempInt);
 					return -EINVAL;
 				}
-				pEseBcnReq->bcnReq[j].measurementToken =
+				req->bcnReq[j].measurementToken =
 					tempInt;
 				break;
 
@@ -2607,7 +2607,7 @@ static int hdd_parse_ese_beacon_req(uint8_t *command,
 						  tempInt);
 					return -EINVAL;
 				}
-				pEseBcnReq->bcnReq[j].channel = tempInt;
+				req->bcnReq[j].channel = tempInt;
 				break;
 
 			case 2: /* Scan mode */
@@ -2617,33 +2617,33 @@ static int hdd_parse_ese_beacon_req(uint8_t *command,
 						  tempInt);
 					return -EINVAL;
 				}
-				pEseBcnReq->bcnReq[j].scanMode = tempInt;
+				req->bcnReq[j].scanMode = tempInt;
 				break;
 
 			case 3: /* Measurement duration */
 				if ((!tempInt
-				     && (pEseBcnReq->bcnReq[j].scanMode !=
+				     && (req->bcnReq[j].scanMode !=
 					 eSIR_BEACON_TABLE)) ||
-				    (pEseBcnReq->bcnReq[j].scanMode ==
+				    (req->bcnReq[j].scanMode ==
 						eSIR_BEACON_TABLE)) {
 					hdd_err("Invalid Measurement Duration: %u",
 						  tempInt);
 					return -EINVAL;
 				}
-				pEseBcnReq->bcnReq[j].measurementDuration =
+				req->bcnReq[j].measurementDuration =
 					tempInt;
 				break;
 			}
 		}
 	}
 
-	for (j = 0; j < pEseBcnReq->numBcnReqIe; j++) {
+	for (j = 0; j < req->numBcnReqIe; j++) {
 		hdd_debug("Index: %d Measurement Token: %u Channel: %u Scan Mode: %u Measurement Duration: %u",
 			  j,
-			  pEseBcnReq->bcnReq[j].measurementToken,
-			  pEseBcnReq->bcnReq[j].channel,
-			  pEseBcnReq->bcnReq[j].scanMode,
-			  pEseBcnReq->bcnReq[j].measurementDuration);
+			  req->bcnReq[j].measurementToken,
+			  req->bcnReq[j].channel,
+			  req->bcnReq[j].scanMode,
+			  req->bcnReq[j].measurementDuration);
 	}
 
 	return 0;
diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h
index 3dd4258deb..d2371311eb 100644
--- a/core/sme/inc/sme_api.h
+++ b/core/sme/inc/sme_api.h
@@ -599,7 +599,7 @@ QDF_STATUS sme_set_cckm_ie(mac_handle_t mac_handle,
 		uint8_t *pCckmIe, uint8_t cckmIeLen);
 QDF_STATUS sme_set_ese_beacon_request(mac_handle_t mac_handle,
 				      const uint8_t sessionId,
-				      const tCsrEseBeaconReq *pEseBcnReq);
+				      const tCsrEseBeaconReq *in_req);
 QDF_STATUS sme_set_plm_request(mac_handle_t mac_handle, struct plm_req *pPlm);
 #endif /*FEATURE_WLAN_ESE */
 QDF_STATUS sme_get_modify_profile_fields(mac_handle_t mac_handle,
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index a4ddd22536..73b918f67a 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -1606,7 +1606,7 @@ QDF_STATUS sme_set_cckm_ie(mac_handle_t mac_handle, uint8_t sessionId,
  * sme_set_ese_beacon_request() - set ese beacon request
  * @mac_handle: Opaque handle to the global MAC context
  * @sessionId: session id
- * @pEseBcnReq: Ese beacon report
+ * @in_req: Ese beacon report request
  *
  * function to set ESE beacon request parameters
  *
@@ -1614,12 +1614,12 @@ QDF_STATUS sme_set_cckm_ie(mac_handle_t mac_handle, uint8_t sessionId,
  */
 QDF_STATUS sme_set_ese_beacon_request(mac_handle_t mac_handle,
 				      const uint8_t sessionId,
-				      const tCsrEseBeaconReq *pEseBcnReq)
+				      const tCsrEseBeaconReq *in_req)
 {
 	QDF_STATUS status;
 	struct mac_context *mac = MAC_CONTEXT(mac_handle);
 	tpSirBeaconReportReqInd pSmeBcnReportReq = NULL;
-	tCsrEseBeaconReqParams *pBeaconReq = NULL;
+	const tCsrEseBeaconReqParams *pBeaconReq = NULL;
 	uint8_t counter = 0;
 	struct csr_roam_session *pSession = CSR_GET_SESSION(mac, sessionId);
 	tpRrmSMEContext pSmeRrmContext = &mac->rrm.rrmSmeContext;
@@ -1630,7 +1630,7 @@ QDF_STATUS sme_set_ese_beacon_request(mac_handle_t mac_handle,
 	}
 
 	/* Store the info in RRM context */
-	qdf_mem_copy(&pSmeRrmContext->eseBcnReqInfo, pEseBcnReq,
+	qdf_mem_copy(&pSmeRrmContext->eseBcnReqInfo, in_req,
 		     sizeof(tCsrEseBeaconReq));
 
 	/* Prepare the request to send to SME. */
@@ -1648,12 +1648,11 @@ QDF_STATUS sme_set_ese_beacon_request(mac_handle_t mac_handle,
 		     pSession->connectedProfile.bssid.bytes,
 		     sizeof(tSirMacAddr));
 	pSmeBcnReportReq->channelInfo.channelNum = 255;
-	pSmeBcnReportReq->channelList.numChannels = pEseBcnReq->numBcnReqIe;
+	pSmeBcnReportReq->channelList.numChannels = in_req->numBcnReqIe;
 	pSmeBcnReportReq->msgSource = eRRM_MSG_SOURCE_ESE_UPLOAD;
 
-	for (counter = 0; counter < pEseBcnReq->numBcnReqIe; counter++) {
-		pBeaconReq =
-			(tCsrEseBeaconReqParams *) &pEseBcnReq->bcnReq[counter];
+	for (counter = 0; counter < in_req->numBcnReqIe; counter++) {
+		pBeaconReq = &in_req->bcnReq[counter];
 		pSmeBcnReportReq->fMeasurementtype[counter] =
 			pBeaconReq->scanMode;
 		pSmeBcnReportReq->measurementDuration[counter] =