diff --git a/core/dp/txrx/ol_txrx.c b/core/dp/txrx/ol_txrx.c
index 77c48f304270..c79498657c96 100644
--- a/core/dp/txrx/ol_txrx.c
+++ b/core/dp/txrx/ol_txrx.c
@@ -1689,16 +1689,16 @@ ol_txrx_get_vdev_mac_addr(ol_txrx_vdev_handle vdev)
 }
 
 /**
- * ol_txrx_get_vdev_struct_mac_addr() - Return handle to struct cdf_mac_addr of
+ * ol_txrx_get_vdev_struct_mac_addr() - Return handle to struct qdf_mac_addr of
  * vdev
  * @vdev: vdev handle
  *
- * Return: Handle to struct cdf_mac_addr
+ * Return: Handle to struct qdf_mac_addr
  */
-struct cdf_mac_addr *
+struct qdf_mac_addr *
 ol_txrx_get_vdev_struct_mac_addr(ol_txrx_vdev_handle vdev)
 {
-	return (struct cdf_mac_addr *)&(vdev->mac_addr);
+	return (struct qdf_mac_addr *)&(vdev->mac_addr);
 }
 
 /**
@@ -1794,18 +1794,18 @@ ol_txrx_remove_peers_for_vdev(ol_txrx_vdev_handle vdev,
 {
 	ol_txrx_peer_handle peer, temp;
 	/* remove all remote peers for vdev */
-	cdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex);
+	qdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex);
 
 	temp = NULL;
 	TAILQ_FOREACH_REVERSE(peer, &vdev->peer_list, peer_list_t,
 			      peer_list_elem) {
 		if (temp) {
-			cdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex);
-			if (cdf_atomic_read(&temp->delete_in_progress) == 0) {
+			qdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex);
+			if (qdf_atomic_read(&temp->delete_in_progress) == 0) {
 				callback(callback_context, temp->mac_addr.raw,
 					vdev->vdev_id, temp, false);
 			}
-			cdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex);
+			qdf_spin_lock_bh(&vdev->pdev->peer_ref_mutex);
 		}
 		/* self peer is deleted last */
 		if (peer == TAILQ_FIRST(&vdev->peer_list)) {
@@ -1824,7 +1824,7 @@ ol_txrx_remove_peers_for_vdev(ol_txrx_vdev_handle vdev,
 			 vdev->vdev_id, peer, false);
 	}
 
-	cdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex);
+	qdf_spin_unlock_bh(&vdev->pdev->peer_ref_mutex);
 }
 
 /**
@@ -1891,7 +1891,7 @@ ol_txrx_get_ocb_chan_info(ol_txrx_vdev_handle vdev)
  * @param data_peer - which peer has changed its state
  * @param state - the new state of the peer
  *
- * Return: CDF Status
+ * Return: QDF Status
  */
 QDF_STATUS ol_txrx_peer_state_update(struct ol_txrx_pdev_t *pdev,
 				     uint8_t *peer_mac,
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index 8f5e5678c63f..1a7a15758891 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -1191,7 +1191,7 @@ QDF_STATUS hdd_change_peer_state(hdd_adapter_t *pAdapter,
 {
 	QDF_STATUS err;
 	uint8_t *peer_mac_addr;
-	struct ol_txrx_pdev_t *pdev = cds_get_context(CDF_MODULE_ID_TXRX);
+	struct ol_txrx_pdev_t *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 	ol_txrx_vdev_handle vdev;
 	ol_txrx_peer_handle peer;
 
diff --git a/core/wma/src/wma_dev_if.c b/core/wma/src/wma_dev_if.c
index 2f8165e57963..d7a51952fc4b 100644
--- a/core/wma/src/wma_dev_if.c
+++ b/core/wma/src/wma_dev_if.c
@@ -1236,7 +1236,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma,
 	struct add_sta_self_params add_sta_self_param;
 	struct del_sta_self_params del_sta_param;
 	QDF_STATUS status;
-	struct cdf_mac_addr *mac_addr;
+	struct qdf_mac_addr *mac_addr;
 	uint8_t *mac_addr_raw;
 
 	if (!wma) {
@@ -1258,7 +1258,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma,
 	}
 
 	qdf_copy_macaddr(
-		(struct cdf_mac_addr *) &(add_sta_self_param.self_mac_addr),
+		(struct qdf_mac_addr *) &(add_sta_self_param.self_mac_addr),
 		mac_addr);
 	add_sta_self_param.session_id = vdev_id;
 	add_sta_self_param.type = WMI_VDEV_TYPE_IBSS;
@@ -1268,7 +1268,7 @@ static void wma_recreate_ibss_vdev_and_bss_peer(tp_wma_handle wma,
 	/* delete old ibss vdev */
 	del_sta_param.session_id = vdev_id;
 	qdf_mem_copy((void *)del_sta_param.self_mac_addr,
-		     (void *)mac_addr, CDF_MAC_ADDR_SIZE);
+		     (void *)mac_addr, QDF_MAC_ADDR_SIZE);
 	wma_vdev_detach(wma, &del_sta_param, 0);
 
 	/* create new vdev for ibss */
@@ -2888,7 +2888,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss)
 	struct del_sta_self_params del_sta_param;
 	tSetBssKeyParams key_info;
 	struct sir_hw_mode_params hw_mode = {0};
-	struct cdf_mac_addr *mac_addr;
+	struct qdf_mac_addr *mac_addr;
 
 	vdev = wma_find_vdev_by_addr(wma, add_bss->selfMacAddr, &vdev_id);
 	if (!vdev) {
@@ -2924,7 +2924,7 @@ static void wma_add_bss_ibss_mode(tp_wma_handle wma, tpAddBssParams add_bss)
 
 		/* remove the non-ibss vdev */
 		qdf_copy_macaddr(
-			(struct cdf_mac_addr *) &(del_sta_param.self_mac_addr),
+			(struct qdf_mac_addr *) &(del_sta_param.self_mac_addr),
 			mac_addr);
 		del_sta_param.session_id = vdev_id;
 		del_sta_param.status = 0;