diff --git a/core/mac/inc/sir_api.h b/core/mac/inc/sir_api.h
index 7a82424178..dc4f3a1fe5 100644
--- a/core/mac/inc/sir_api.h
+++ b/core/mac/inc/sir_api.h
@@ -6886,11 +6886,11 @@ struct wow_pulse_mode {
 
 
 /**
- * cds_send_mb_message_to_mac(): post message to umac
+ * umac_send_mb_message_to_mac(): post message to umac
  * @msg: opaque message pointer
  *
  * Return: QDF status
  */
-QDF_STATUS cds_send_mb_message_to_mac(void *msg);
+QDF_STATUS umac_send_mb_message_to_mac(void *msg);
 
 #endif /* __SIR_API_H */
diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c
index 8ed07104c8..e880a5beb0 100644
--- a/core/sme/src/common/sme_api.c
+++ b/core/sme/src/common/sme_api.c
@@ -6646,7 +6646,7 @@ QDF_STATUS sme_register_p2p_ack_ind_callback(tHalHandle hal,
 		msg->length = sizeof(*msg);
 
 		msg->callback = callback;
-		status = cds_send_mb_message_to_mac(msg);
+		status = umac_send_mb_message_to_mac(msg);
 		sme_release_global_lock(&mac_ctx->sme);
 		return status;
 	}
@@ -6687,7 +6687,7 @@ QDF_STATUS sme_register_mgmt_frame_ind_callback(tHalHandle hal,
 		msg->length          = sizeof(*msg);
 
 		msg->callback = callback;
-		status = cds_send_mb_message_to_mac(msg);
+		status = umac_send_mb_message_to_mac(msg);
 		sme_release_global_lock(&mac_ctx->sme);
 		return status;
 	}
@@ -6747,7 +6747,7 @@ QDF_STATUS sme_register_mgmt_frame(tHalHandle hHal, uint8_t sessionId,
 			pMsg->frameType = frameType;
 			pMsg->matchLen = matchLen;
 			qdf_mem_copy(pMsg->matchData, matchData, matchLen);
-			status = cds_send_mb_message_to_mac(pMsg);
+			status = umac_send_mb_message_to_mac(pMsg);
 		}
 		sme_release_global_lock(&pMac->sme);
 	}
@@ -6807,7 +6807,7 @@ QDF_STATUS sme_deregister_mgmt_frame(tHalHandle hHal, uint8_t sessionId,
 			pMsg->frameType = frameType;
 			pMsg->matchLen = matchLen;
 			qdf_mem_copy(pMsg->matchData, matchData, matchLen);
-			status = cds_send_mb_message_to_mac(pMsg);
+			status = umac_send_mb_message_to_mac(pMsg);
 		}
 		sme_release_global_lock(&pMac->sme);
 	}
@@ -8404,7 +8404,7 @@ QDF_STATUS sme_update_session_param(tHalHandle hal, uint8_t session_id,
 			msg->session_id = session_id;
 			msg->param_type = param_type;
 			msg->param_val = param_val;
-			status = cds_send_mb_message_to_mac(msg);
+			status = umac_send_mb_message_to_mac(msg);
 		}
 		sme_release_global_lock(&mac_ctx->sme);
 	}
@@ -12271,7 +12271,7 @@ QDF_STATUS sme_update_access_policy_vendor_ie(tHalHandle hal,
 	sms_log(mac, LOG1, "sme_session_id %hu, access_policy %d", session_id,
 			access_policy);
 
-	status = cds_send_mb_message_to_mac(msg);
+	status = umac_send_mb_message_to_mac(msg);
 
 	return status;
 }
@@ -16270,7 +16270,7 @@ void sme_send_disassoc_req_frame(tHalHandle hal, uint8_t session_id,
 	*buf =  wait_for_ack;
 	buf += sizeof(uint8_t);
 
-	qdf_status = cds_send_mb_message_to_mac(msg);
+	qdf_status = umac_send_mb_message_to_mac(msg);
 
 	if (qdf_status != QDF_STATUS_SUCCESS)
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR,
@@ -16465,7 +16465,7 @@ QDF_STATUS sme_create_mon_session(tHalHandle hal_handle, tSirMacAddr bss_id)
 		msg->type = eWNI_SME_MON_INIT_SESSION;
 		msg->msg_len = sizeof(*msg);
 		qdf_mem_copy(msg->bss_id.bytes, bss_id, QDF_MAC_ADDR_SIZE);
-		status = cds_send_mb_message_to_mac(msg);
+		status = umac_send_mb_message_to_mac(msg);
 	}
 	return status;
 }
@@ -16535,7 +16535,7 @@ void sme_set_vdev_ies_per_band(tHalHandle hal, uint8_t vdev_id)
 	sms_log(p_mac, LOG1,
 		FL("sending eWNI_SME_SET_VDEV_IES_PER_BAND: vdev_id: %d "),
 		vdev_id);
-	status = cds_send_mb_message_to_mac(p_msg);
+	status = umac_send_mb_message_to_mac(p_msg);
 	if (QDF_STATUS_SUCCESS != status)
 		sms_log(p_mac, LOGE,
 			FL("Send eWNI_SME_SET_VDEV_IES_PER_BAND fail"));
@@ -16594,7 +16594,7 @@ void sme_set_pdev_ht_vht_ies(tHalHandle hal, bool enable2x2)
 				FL("SET_HT_VHT_IE with nss %d, dot11mode %d"),
 				ht_vht_cfg->nss,
 				ht_vht_cfg->dot11mode);
-		status = cds_send_mb_message_to_mac(ht_vht_cfg);
+		status = umac_send_mb_message_to_mac(ht_vht_cfg);
 		if (QDF_STATUS_SUCCESS != status) {
 			sms_log(mac_ctx, LOGE, FL(
 					"Send SME_PDEV_SET_HT_VHT_IE fail"));
@@ -16844,7 +16844,7 @@ QDF_STATUS sme_set_default_scan_ie(tHalHandle hal, uint16_t session_id,
 			set_ie_params->session_id = session_id;
 			set_ie_params->ie_len = ie_len;
 			qdf_mem_copy(set_ie_params->ie_data, ie_data, ie_len);
-			status = cds_send_mb_message_to_mac(set_ie_params);
+			status = umac_send_mb_message_to_mac(set_ie_params);
 		}
 		sme_release_global_lock(&mac_ctx->sme);
 	}
diff --git a/core/sme/src/common/sme_ft_api.c b/core/sme/src/common/sme_ft_api.c
index fa4067a885..79f2bd792f 100644
--- a/core/sme/src/common/sme_ft_api.c
+++ b/core/sme/src/common/sme_ft_api.c
@@ -333,7 +333,7 @@ QDF_STATUS sme_ft_send_update_key_ind(tHalHandle hal, uint32_t session_id,
 	msg->smeSessionId = session_id;
 	sms_log(mac_ctx, LOG1, "BSSID = " MAC_ADDRESS_STR,
 		MAC_ADDR_ARRAY(msg->bssid.bytes));
-	status = cds_send_mb_message_to_mac(msg);
+	status = umac_send_mb_message_to_mac(msg);
 
 	return status;
 }
diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c
index 0ca5f33c3d..873cb5f745 100644
--- a/core/sme/src/csr/csr_api_roam.c
+++ b/core/sme/src/csr/csr_api_roam.c
@@ -1877,11 +1877,11 @@ QDF_STATUS csr_get_tsm_stats(tpAniSirGlobal pMac,
 	pMsg->tsmStatsCallback = callback;
 	pMsg->pDevContext = pContext;
 	pMsg->p_cds_context = p_cds_context;
-	status = cds_send_mb_message_to_mac(pMsg);
+	status = umac_send_mb_message_to_mac(pMsg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(pMac, LOG1,
 			" csr_get_tsm_stats: failed to send down the rssi req");
-		/* pMsg is freed by cds_send_mb_message_to_mac */
+		/* pMsg is freed by umac_send_mb_message_to_mac */
 		status = QDF_STATUS_E_FAILURE;
 	}
 	return status;
@@ -3780,7 +3780,7 @@ csr_send_mb_tkip_counter_measures_req_msg(tpAniSirGlobal pMac,
 		pMsg->transactionId = 0;
 		qdf_copy_macaddr(&pMsg->bssId, bssId);
 		pMsg->bEnable = bEnable;
-		status = cds_send_mb_message_to_mac(pMsg);
+		status = umac_send_mb_message_to_mac(pMsg);
 	} while (0);
 	return status;
 }
@@ -10383,7 +10383,7 @@ static QDF_STATUS csr_send_reset_ap_caps_changed(tpAniSirGlobal pMac,
 		sms_log(pMac, LOG1,
 			FL("CSR reset caps change for Bssid= " MAC_ADDRESS_STR),
 			MAC_ADDR_ARRAY(pMsg->bssId.bytes));
-		status = cds_send_mb_message_to_mac(pMsg);
+		status = umac_send_mb_message_to_mac(pMsg);
 	} else {
 		sms_log(pMac, LOGE, FL("Memory allocation failed"));
 	}
@@ -11289,7 +11289,7 @@ csr_roam_chk_lnk_set_ctx_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr)
 			qdf_copy_macaddr(&pMsg->bssid,
 				&session->connectedProfile.bssid);
 
-			status = cds_send_mb_message_to_mac(pMsg);
+			status = umac_send_mb_message_to_mac(pMsg);
 			/*
 			 * OBSS SCAN Indication will be sent to Firmware
 			 * to start OBSS Scan
@@ -11316,7 +11316,7 @@ csr_roam_chk_lnk_set_ctx_rsp(tpAniSirGlobal mac_ctx, tSirSmeRsp *msg_ptr)
 				      sizeof(struct sme_obss_ht40_scanind_msg);
 				qdf_copy_macaddr(&msg->mac_addr,
 					&session->connectedProfile.bssid);
-				status = cds_send_mb_message_to_mac(msg);
+				status = umac_send_mb_message_to_mac(msg);
 			}
 			result = eCSR_ROAM_RESULT_AUTHENTICATED;
 		} else {
@@ -14497,10 +14497,10 @@ QDF_STATUS csr_send_join_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
 					break;
 			}
 		}
-		status = cds_send_mb_message_to_mac(csr_join_req);
+		status = umac_send_mb_message_to_mac(csr_join_req);
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
 			/*
-			 * cds_send_mb_message_to_mac would've released the mem
+			 * umac_send_mb_message_to_mac would've released the mem
 			 * allocated by csr_join_req. Let's make it defensive by
 			 * assigning NULL to the pointer.
 			 */
@@ -14598,7 +14598,7 @@ QDF_STATUS csr_send_mb_disassoc_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
 		/* Set DoNotSendOverTheAir flag to 1 only for handoff case */
 		pMsg->doNotSendOverTheAir = CSR_DONT_SEND_DISASSOC_OVER_THE_AIR;
 	}
-	return cds_send_mb_message_to_mac(pMsg);
+	return umac_send_mb_message_to_mac(pMsg);
 }
 
 QDF_STATUS
@@ -14624,7 +14624,7 @@ csr_send_mb_get_associated_stas_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
 			pfnSapEventCallback, sizeof(void *));
 	qdf_mem_copy(pMsg->pAssocStasArray, pAssocStasBuf, sizeof(void *));
 	pMsg->length = sizeof(*pMsg);
-	status = cds_send_mb_message_to_mac(pMsg);
+	status = umac_send_mb_message_to_mac(pMsg);
 
 	return status;
 }
@@ -14654,7 +14654,7 @@ csr_send_mb_get_wpspbc_sessions(tpAniSirGlobal pMac, uint32_t sessionId,
 		qdf_copy_macaddr(&pMsg->bssid, &bssid);
 		qdf_copy_macaddr(&pMsg->remove_mac, &remove_mac);
 		pMsg->length = sizeof(struct sSirSmeGetWPSPBCSessionsReq);
-		status = cds_send_mb_message_to_mac(pMsg);
+		status = umac_send_mb_message_to_mac(pMsg);
 	} while (0);
 	return status;
 }
@@ -14699,7 +14699,7 @@ QDF_STATUS csr_send_chng_mcc_beacon_interval(tpAniSirGlobal pMac, uint32_t sessi
 			beaconInterval);
 		pMsg->beaconInterval =
 			pMac->roam.roamSession[sessionId].bssParams.beaconInterval;
-		status = cds_send_mb_message_to_mac(pMsg);
+		status = umac_send_mb_message_to_mac(pMsg);
 	}
 	return status;
 }
@@ -14739,7 +14739,7 @@ QDF_STATUS csr_set_ht2040_mode(tpAniSirGlobal pMac, uint32_t sessionId,
 			sessionId, cbMode);
 		pMsg->cbMode = cbMode;
 		pMsg->obssEnabled = obssEnabled;
-		status = cds_send_mb_message_to_mac(pMsg);
+		status = umac_send_mb_message_to_mac(pMsg);
 	}
 	return status;
 }
@@ -14778,7 +14778,7 @@ QDF_STATUS csr_send_mb_deauth_req_msg(tpAniSirGlobal pMac, uint32_t sessionId,
 	qdf_mem_copy(&pMsg->peer_macaddr.bytes, bssId, QDF_MAC_ADDR_SIZE);
 	pMsg->reasonCode = reasonCode;
 
-	return cds_send_mb_message_to_mac(pMsg);
+	return umac_send_mb_message_to_mac(pMsg);
 }
 
 QDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac,
@@ -14812,7 +14812,7 @@ QDF_STATUS csr_send_mb_disassoc_cnf_msg(tpAniSirGlobal pMac,
 			break;
 		}
 
-		status = cds_send_mb_message_to_mac(pMsg);
+		status = umac_send_mb_message_to_mac(pMsg);
 	} while (0);
 	return status;
 }
@@ -14846,7 +14846,7 @@ QDF_STATUS csr_send_mb_deauth_cnf_msg(tpAniSirGlobal pMac,
 			qdf_mem_free(pMsg);
 			break;
 		}
-		status = cds_send_mb_message_to_mac(pMsg);
+		status = umac_send_mb_message_to_mac(pMsg);
 	} while (0);
 	return status;
 }
@@ -14883,8 +14883,8 @@ QDF_STATUS csr_send_assoc_cnf_msg(tpAniSirGlobal pMac, tpSirSmeAssocInd pAssocIn
 			     QDF_MAC_ADDR_SIZE);
 		/* alternateChannelId */
 		pMsg->alternateChannelId = 11;
-		/* pMsg is freed by cds_send_mb_message_to_mac in anycase*/
-		status = cds_send_mb_message_to_mac(pMsg);
+		/* pMsg is freed by umac_send_mb_message_to_mac in anycase*/
+		status = umac_send_mb_message_to_mac(pMsg);
 	} while (0);
 	return status;
 }
@@ -15037,7 +15037,7 @@ QDF_STATUS csr_send_mb_set_context_req_msg(tpAniSirGlobal pMac,
 			sir_dump_buf(pMac, SIR_SMS_MODULE_ID, LOG1, pKey,
 				     keyLength);
 		}
-		status = cds_send_mb_message_to_mac(pMsg);
+		status = umac_send_mb_message_to_mac(pMsg);
 	} while (0);
 	return status;
 }
@@ -15173,7 +15173,7 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId
 	pMsg->vendor_vht_sap =
 			pMac->roam.configParam.vendor_vht_sap;
 
-	return cds_send_mb_message_to_mac(pMsg);
+	return umac_send_mb_message_to_mac(pMsg);
 }
 
 QDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId)
@@ -15195,7 +15195,7 @@ QDF_STATUS csr_send_mb_stop_bss_req_msg(tpAniSirGlobal pMac, uint32_t sessionId)
 	pMsg->transactionId = 0;
 	pMsg->reasonCode = 0;
 	qdf_copy_macaddr(&pMsg->bssid, &pSession->connectedProfile.bssid);
-	return cds_send_mb_message_to_mac(pMsg);
+	return umac_send_mb_message_to_mac(pMsg);
 }
 
 QDF_STATUS csr_reassoc(tpAniSirGlobal pMac, uint32_t sessionId,
@@ -15277,7 +15277,7 @@ QDF_STATUS csr_process_add_sta_session_rsp(tpAniSirGlobal pMac, uint8_t *pMsg)
 		msg->msg_type = eWNI_SME_SET_IE_REQ;
 		msg->session_id = rsp->session_id;
 		msg->length = sizeof(*msg);
-		status = cds_send_mb_message_to_mac(msg);
+		status = umac_send_mb_message_to_mac(msg);
 		if (!QDF_IS_STATUS_SUCCESS(status))
 			sms_log(pMac, LOGE,
 				FL("Failed to send down the set IE req "));
@@ -16139,7 +16139,7 @@ QDF_STATUS csr_send_mb_stats_req_msg(tpAniSirGlobal pMac, uint32_t statsMask,
 	pMsg->staId = staId;
 	pMsg->statsMask = statsMask;
 	pMsg->sessionId = sessionId;
-	status = cds_send_mb_message_to_mac(pMsg);
+	status = umac_send_mb_message_to_mac(pMsg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(pMac, LOG1, FL("Failed to send down the stats req "));
 	}
@@ -17610,7 +17610,7 @@ static QDF_STATUS csr_roam_send_rso_cmd(tpAniSirGlobal mac_ctx,
 	request_buf->message_type = eWNI_SME_ROAM_SCAN_OFFLOAD_REQ;
 	request_buf->length = sizeof(*request_buf);
 
-	status = cds_send_mb_message_to_mac(request_buf);
+	status = umac_send_mb_message_to_mac(request_buf);
 	if (QDF_STATUS_SUCCESS != status) {
 		sms_log(mac_ctx, LOGE, FL("Send RSO from CSR failed"));
 		return status;
@@ -18479,7 +18479,7 @@ QDF_STATUS csr_roam_update_apwpsie(tpAniSirGlobal pMac, uint32_t sessionId,
 	pMsg->sessionId = sessionId;
 	qdf_mem_copy(&pMsg->APWPSIEs, pAPWPSIES, sizeof(tSirAPWPSIEs));
 	pMsg->length = sizeof(*pMsg);
-	status = cds_send_mb_message_to_mac(pMsg);
+	status = umac_send_mb_message_to_mac(pMsg);
 
 	return status;
 }
@@ -18507,7 +18507,7 @@ QDF_STATUS csr_roam_update_wparsni_es(tpAniSirGlobal pMac, uint32_t sessionId,
 		qdf_mem_copy(&pMsg->APWPARSNIEs, pAPSirRSNie,
 			     sizeof(tSirRSNie));
 		pMsg->length = sizeof(struct sSirUpdateAPWPARSNIEsReq);
-		status = cds_send_mb_message_to_mac(pMsg);
+		status = umac_send_mb_message_to_mac(pMsg);
 	} while (0);
 	return status;
 }
@@ -18656,7 +18656,7 @@ QDF_STATUS csr_roam_channel_change_req(tpAniSirGlobal pMac,
 		&param.operationalRateSet, sizeof(pMsg->operational_rateset));
 	qdf_mem_copy(&pMsg->extended_rateset,
 		&param.extendedRateSet, sizeof(pMsg->extended_rateset));
-	status = cds_send_mb_message_to_mac(pMsg);
+	status = umac_send_mb_message_to_mac(pMsg);
 
 	return status;
 }
@@ -18684,7 +18684,7 @@ QDF_STATUS csr_roam_start_beacon_req(tpAniSirGlobal pMac,
 	pMsg->beaconStartStatus = dfsCacWaitStatus;
 	qdf_mem_copy(pMsg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE);
 
-	status = cds_send_mb_message_to_mac(pMsg);
+	status = umac_send_mb_message_to_mac(pMsg);
 
 	return status;
 }
@@ -18740,7 +18740,7 @@ csr_roam_modify_add_ies(tpAniSirGlobal pMac,
 
 	pModifyAddIEInd->updateType = updateType;
 
-	status = cds_send_mb_message_to_mac(pModifyAddIEInd);
+	status = umac_send_mb_message_to_mac(pModifyAddIEInd);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(pMac, LOGE,
 			FL("Failed to send eWNI_SME_UPDATE_ADDTIONAL_IES msg"
@@ -18803,7 +18803,7 @@ csr_roam_update_add_ies(tpAniSirGlobal pMac,
 
 	pUpdateAddIEs->updateType = updateType;
 
-	status = cds_send_mb_message_to_mac(pUpdateAddIEs);
+	status = umac_send_mb_message_to_mac(pUpdateAddIEs);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(pMac, LOGE,
 			FL("Failed to send eWNI_SME_UPDATE_ADDTIONAL_IES msg"
@@ -18838,7 +18838,7 @@ QDF_STATUS csr_send_ext_change_channel(tpAniSirGlobal mac_ctx, uint32_t channel,
 	msg->length = sizeof(*msg);
 	msg->new_channel = channel;
 	msg->session_id = session_id;
-	status = cds_send_mb_message_to_mac(msg);
+	status = umac_send_mb_message_to_mac(msg);
 	return status;
 }
 
@@ -18877,7 +18877,7 @@ QDF_STATUS csr_roam_send_chan_sw_ie_request(tpAniSirGlobal mac_ctx,
 	qdf_mem_copy(msg->bssid, bssid.bytes, QDF_MAC_ADDR_SIZE);
 	qdf_mem_copy(&msg->ch_params, ch_params, sizeof(struct ch_params_s));
 
-	status = cds_send_mb_message_to_mac(msg);
+	status = umac_send_mb_message_to_mac(msg);
 
 	return status;
 }
@@ -19375,7 +19375,7 @@ void csr_process_set_hw_mode(tpAniSirGlobal mac, tSmeCmd *command)
 		command->u.set_hw_mode_cmd.session_id,
 		command->u.set_hw_mode_cmd.reason);
 
-	status = cds_send_mb_message_to_mac(cmd);
+	status = umac_send_mb_message_to_mac(cmd);
 	if (QDF_STATUS_SUCCESS != status) {
 		sms_log(mac, LOGE, FL("Posting to PE failed"));
 		return;
@@ -19451,7 +19451,7 @@ void csr_process_set_dual_mac_config(tpAniSirGlobal mac, tSmeCmd *command)
 		cmd->set_dual_mac.scan_config,
 		cmd->set_dual_mac.fw_mode_config);
 
-	status = cds_send_mb_message_to_mac(cmd);
+	status = umac_send_mb_message_to_mac(cmd);
 	if (QDF_STATUS_SUCCESS != status) {
 		sms_log(mac, LOGE, FL("Posting to PE failed"));
 		return;
@@ -19515,11 +19515,11 @@ void csr_process_set_antenna_mode(tpAniSirGlobal mac, tSmeCmd *command)
 		cmd->set_antenna_mode.num_rx_chains,
 		cmd->set_antenna_mode.num_tx_chains);
 
-	status = cds_send_mb_message_to_mac(cmd);
+	status = umac_send_mb_message_to_mac(cmd);
 	if (QDF_STATUS_SUCCESS != status) {
 		sms_log(mac, LOGE, FL("Posting to PE failed"));
 		/*
-		 * cds_send_mb_message_to_mac would've released the mem
+		 * umac_send_mb_message_to_mac would've released the mem
 		 * allocated by cmd.
 		 */
 		goto fail;
@@ -19591,7 +19591,7 @@ void csr_process_nss_update_req(tpAniSirGlobal mac, tSmeCmd *command)
 	sms_log(mac, LOG1,
 		FL("Posting eWNI_SME_NSS_UPDATE_REQ to PE"));
 
-	status = cds_send_mb_message_to_mac(msg);
+	status = umac_send_mb_message_to_mac(msg);
 	if (QDF_STATUS_SUCCESS != status) {
 		sms_log(mac, LOGE, FL("Posting to PE failed"));
 		return;
diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c
index eb54692feb..882be59f45 100644
--- a/core/sme/src/csr/csr_api_scan.c
+++ b/core/sme/src/csr/csr_api_scan.c
@@ -3251,7 +3251,7 @@ static void csr_clear_dfs_channel_list(tpAniSirGlobal pMac)
 	if (NULL != pMsg) {
 		pMsg->type = eWNI_SME_CLEAR_DFS_CHANNEL_LIST;
 		pMsg->msgLen = msgLen;
-		cds_send_mb_message_to_mac(pMsg);
+		umac_send_mb_message_to_mac(pMsg);
 	}
 }
 
@@ -5174,7 +5174,7 @@ send_scan_req:
 	}
 
 	if (QDF_IS_STATUS_SUCCESS(status)) {
-		status = cds_send_mb_message_to_mac(pMsg);
+		status = umac_send_mb_message_to_mac(pMsg);
 	} else {
 		sms_log(pMac, LOGE,
 			FL("failed to send down scan req with status = %d"),
@@ -6878,7 +6878,7 @@ static void csr_send_scan_abort(tpAniSirGlobal mac_ctx,
 	sms_log(mac_ctx, LOG2,
 		FL("Abort scan sent to Firmware scan_id %d session %d"),
 		scan_id, session_id);
-	status = cds_send_mb_message_to_mac(msg);
+	status = umac_send_mb_message_to_mac(msg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(mac_ctx, LOGE,
 			FL("Failed to send abort scan.scan_id %d session %d"),
@@ -7416,7 +7416,7 @@ void csr_scan_active_list_timeout_handle(void *userData)
 	msg->msgLen = msg_len;
 	msg->sessionId = scan_cmd->sessionId;
 	msg->scan_id = scan_id;
-	status = cds_send_mb_message_to_mac(msg);
+	status = umac_send_mb_message_to_mac(msg);
 	if (!QDF_IS_STATUS_SUCCESS(status)) {
 		sms_log(mac_ctx, LOGE,
 			FL(" Failed to post message to LIM"));
diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c
index 21fd9584fa..fc9b6f6324 100644
--- a/core/sme/src/csr/csr_neighbor_roam.c
+++ b/core/sme/src/csr/csr_neighbor_roam.c
@@ -1147,7 +1147,7 @@ QDF_STATUS csr_neighbor_roam_indicate_connect(
 		msg->seesionId = session_id;
 		qdf_copy_macaddr(&msg->bssid,
 			&session->connectedProfile.bssid);
-		status = cds_send_mb_message_to_mac(msg);
+		status = umac_send_mb_message_to_mac(msg);
 		qdf_copy_macaddr(&roamInfo.peerMac,
 			&session->connectedProfile.bssid);
 		roamInfo.roamSynchInProgress =
diff --git a/core/sme/src/csr/csr_roam_preauth.c b/core/sme/src/csr/csr_roam_preauth.c
index 7b89345bae..225c631be4 100644
--- a/core/sme/src/csr/csr_roam_preauth.c
+++ b/core/sme/src/csr/csr_roam_preauth.c
@@ -552,7 +552,7 @@ QDF_STATUS csr_roam_issue_ft_preauth_req(tHalHandle hal, uint32_t session_id,
 	qdf_mem_copy(preauth_req->pbssDescription, bss_desc,
 			sizeof(bss_desc->length) + bss_desc->length);
 	preauth_req->length = auth_req_len;
-	return cds_send_mb_message_to_mac(preauth_req);
+	return umac_send_mb_message_to_mac(preauth_req);
 }
 
 /**
diff --git a/core/sme/src/csr/csr_tdls_process.c b/core/sme/src/csr/csr_tdls_process.c
index 25dd4bb798..4eabdbc966 100644
--- a/core/sme/src/csr/csr_tdls_process.c
+++ b/core/sme/src/csr/csr_tdls_process.c
@@ -374,7 +374,7 @@ static QDF_STATUS tdls_send_message(tpAniSirGlobal pMac, uint16_t msg_type,
 	QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO,
 		  ("sending msg = %d"), pMsg->type);
 	/* Send message. */
-	if (cds_send_mb_message_to_mac(pMsg) != QDF_STATUS_SUCCESS) {
+	if (umac_send_mb_message_to_mac(pMsg) != QDF_STATUS_SUCCESS) {
 		sms_log(pMac, LOGE, FL("Cannot send message"));
 		return QDF_STATUS_E_FAILURE;
 	}
diff --git a/core/sme/src/nan/nan_datapath_api.c b/core/sme/src/nan/nan_datapath_api.c
index da2c00850e..87b5338ff2 100644
--- a/core/sme/src/nan/nan_datapath_api.c
+++ b/core/sme/src/nan/nan_datapath_api.c
@@ -498,7 +498,7 @@ QDF_STATUS csr_process_ndp_initiator_request(tpAniSirGlobal mac_ctx,
 	sms_log(mac_ctx, LOG1, FL("selfMac = "MAC_ADDRESS_STR),
 		MAC_ADDR_ARRAY(self_mac_addr));
 
-	status = cds_send_mb_message_to_mac(lim_msg);
+	status = umac_send_mb_message_to_mac(lim_msg);
 	if (status != QDF_STATUS_SUCCESS)
 		csr_free_ndp_initiator_req(cmd);
 
@@ -554,7 +554,7 @@ QDF_STATUS csr_process_ndp_responder_request(tpAniSirGlobal mac_ctx,
 		lim_msg->req.ndp_rsp,
 		lim_msg->req.ndp_instance_id);
 
-	status = cds_send_mb_message_to_mac(lim_msg);
+	status = umac_send_mb_message_to_mac(lim_msg);
 
 free_config:
 	/* If fail, free up the ndp_cfg and ndp_app_info allocated in sme. */
@@ -595,7 +595,7 @@ QDF_STATUS csr_process_ndp_data_end_request(tpAniSirGlobal mac_ctx,
 	lim_msg->msg_len = msg_len;
 	lim_msg->req = cmd->u.data_end_req;
 
-	status = cds_send_mb_message_to_mac(lim_msg);
+	status = umac_send_mb_message_to_mac(lim_msg);
 	if (status != QDF_STATUS_SUCCESS) {
 		qdf_mem_free(cmd->u.data_end_req);
 		cmd->u.data_end_req = NULL;
diff --git a/core/sme/src/p2p/p2p_api.c b/core/sme/src/p2p/p2p_api.c
index 41689ea501..84c67625f3 100644
--- a/core/sme/src/p2p/p2p_api.c
+++ b/core/sme/src/p2p/p2p_api.c
@@ -89,7 +89,7 @@ QDF_STATUS p2p_process_remain_on_channel_cmd(tpAniSirGlobal pMac,
 			qdf_mem_copy((void *)pMsg->probeRspIe,
 				     (void *)pMac->p2pContext.probeRspIe,
 				     pMac->p2pContext.probeRspIeLength);
-		status = cds_send_mb_message_to_mac(pMsg);
+		status = umac_send_mb_message_to_mac(pMsg);
 	}
 error:
 	if (QDF_STATUS_E_FAILURE == status)
@@ -307,7 +307,7 @@ QDF_STATUS p2p_send_action(tHalHandle hHal, uint8_t sessionId,
 		pMsg->channel_freq = channel_freq;
 		pMsg->wait = (uint16_t) wait;
 		qdf_mem_copy(pMsg->data, pBuf, len);
-		status = cds_send_mb_message_to_mac(pMsg);
+		status = umac_send_mb_message_to_mac(pMsg);
 	}
 	return status;
 }
@@ -331,7 +331,7 @@ QDF_STATUS p2p_cancel_remain_on_channel(tHalHandle hHal,
 		pMsg->msgLen = msgLen;
 		pMsg->sessionId = sessionId;
 		pMsg->scan_id = scan_id;
-		status = cds_send_mb_message_to_mac(pMsg);
+		status = umac_send_mb_message_to_mac(pMsg);
 	}
 
 	return status;
diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c
index dc40f989d2..51c57e9ece 100644
--- a/core/sme/src/qos/sme_qos.c
+++ b/core/sme/src/qos/sme_qos.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -3531,7 +3531,7 @@ QDF_STATUS sme_qos_ft_aggr_qos_req(tpAniSirGlobal mac_ctx, uint8_t session_id)
 		  FL("Sending aggregated message to HAL 0x%x"),
 		  aggr_req->aggrInfo.tspecIdx);
 
-	if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(aggr_req))) {
+	if (QDF_IS_STATUS_SUCCESS(umac_send_mb_message_to_mac(aggr_req))) {
 		status = QDF_STATUS_SUCCESS;
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  FL("sent down a AGGR QoS req to PE"));
@@ -4004,7 +4004,7 @@ QDF_STATUS sme_qos_add_ts_req(tpAniSirGlobal pMac,
 		pMsg->req.tsrsPresent = 1;
 	}
 #endif
-	if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) {
+	if (QDF_IS_STATUS_SUCCESS(umac_send_mb_message_to_mac(pMsg))) {
 		status = QDF_STATUS_SUCCESS;
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: sent down a ADDTS req to PE",
@@ -4110,7 +4110,7 @@ QDF_STATUS sme_qos_del_ts_req(tpAniSirGlobal pMac,
 		  pTspecInfo->ts_info.up, pTspecInfo->ts_info.tid);
 	qdf_mem_zero(&pACInfo->curr_QoSInfo[tspec_mask - 1],
 		     sizeof(sme_QosWmmTspecInfo));
-	if (QDF_IS_STATUS_SUCCESS(cds_send_mb_message_to_mac(pMsg))) {
+	if (QDF_IS_STATUS_SUCCESS(umac_send_mb_message_to_mac(pMsg))) {
 		status = QDF_STATUS_SUCCESS;
 		QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_INFO_HIGH,
 			  "%s: %d: sme_qos_del_ts_req:Test: sent down a DELTS req to PE",
diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c
index 34d9308eb4..3583ac88c5 100644
--- a/core/sme/src/rrm/sme_rrm.c
+++ b/core/sme/src/rrm/sme_rrm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -250,7 +250,7 @@ sme_rrm_send_beacon_report_xmit_ind(tpAniSirGlobal mac_ctx,
 		sms_log(mac_ctx, LOG1,
 			"SME Sending BcnRepXmit to PE numBss %d i %d j %d",
 			beacon_rep->numBssDesc, i, j);
-		status = cds_send_mb_message_to_mac(beacon_rep);
+		status = umac_send_mb_message_to_mac(beacon_rep);
 	} while (cur_result);
 
 	return status;
@@ -974,7 +974,7 @@ QDF_STATUS sme_rrm_neighbor_report_request(tpAniSirGlobal pMac, uint8_t sessionI
 	pMsg->noSSID = pNeighborReq->no_ssid;
 	qdf_mem_copy(&pMsg->ucSSID, &pNeighborReq->ssid, sizeof(tSirMacSSid));
 
-	status = cds_send_mb_message_to_mac(pMsg);
+	status = umac_send_mb_message_to_mac(pMsg);
 	if (status != QDF_STATUS_SUCCESS)
 		return QDF_STATUS_E_FAILURE;
 
diff --git a/core/wma/src/wlan_qct_wma_legacy.c b/core/wma/src/wlan_qct_wma_legacy.c
index 906c49ce50..938d17d5d1 100644
--- a/core/wma/src/wlan_qct_wma_legacy.c
+++ b/core/wma/src/wlan_qct_wma_legacy.c
@@ -157,12 +157,12 @@ tSirRetStatus u_mac_post_ctrl_msg(void *pSirGlobal, tSirMbMsg *pMb)
 } /* u_mac_post_ctrl_msg() */
 
 /**
- * cds_send_mb_message_to_mac() - post a message to a message queue
+ * umac_send_mb_message_to_mac() - post a message to a message queue
  * @pBuf: Pointer to buffer allocated by caller
  *
  * Return: qdf status
  */
-QDF_STATUS cds_send_mb_message_to_mac(void *pBuf)
+QDF_STATUS umac_send_mb_message_to_mac(void *pBuf)
 {
 	QDF_STATUS qdf_ret_status = QDF_STATUS_E_FAILURE;
 	tSirRetStatus sirStatus;