diff --git a/wmi_unified_apf_tlv.h b/wmi_unified_apf_tlv.h
index 2940d4c8c3..ab764198bc 100644
--- a/wmi_unified_apf_tlv.h
+++ b/wmi_unified_apf_tlv.h
@@ -24,19 +24,19 @@
 #include "wmi_unified_param.h"
 
 /**
- * send_set_active_bpf_mode_cmd_tlv() - configure active BPF mode in FW
+ * send_set_active_apf_mode_cmd_tlv() - configure active APF mode in FW
  * @wmi_handle: the WMI handle
  * @vdev_id: the Id of the vdev to apply the configuration to
- * @ucast_mode: the active BPF mode to configure for unicast packets
- * @mcast_bcast_mode: the active BPF mode to configure for multicast/broadcast
+ * @ucast_mode: the active APF mode to configure for unicast packets
+ * @mcast_bcast_mode: the active APF mode to configure for multicast/broadcast
  *	packets
  *
  * Return: QDF status
  */
 QDF_STATUS
-send_set_active_bpf_mode_cmd_tlv(wmi_unified_t wmi_handle,
+send_set_active_apf_mode_cmd_tlv(wmi_unified_t wmi_handle,
 				 uint8_t vdev_id,
-				 enum wmi_host_active_bpf_mode ucast_mode,
-				 enum wmi_host_active_bpf_mode
+				 enum wmi_host_active_apf_mode ucast_mode,
+				 enum wmi_host_active_apf_mode
 							mcast_bcast_mode);
 #endif /* _WMI_UNIFIED_APF_TLV_H_ */
diff --git a/wmi_unified_api.h b/wmi_unified_api.h
index a3726dfaa0..680226abe7 100644
--- a/wmi_unified_api.h
+++ b/wmi_unified_api.h
@@ -1097,17 +1097,18 @@ QDF_STATUS wmi_unified_set_per_roam_config(void *wmi_hdl,
 		struct wmi_per_roam_config_req *req_buf);
 
 /**
- * wmi_unified_set_active_bpf_mode_cmd() - config active BPF mode in FW
+ * wmi_unified_set_active_apf_mode_cmd() - config active APF mode in FW
  * @wmi_hdl: the WMI handle
  * @vdev_id: the Id of the vdev to apply the configuration to
- * @ucast_mode: the active BPF mode to configure for unicast packets
- * @mcast_bcast_mode: the active BPF mode to configure for multicast/broadcast
+ * @ucast_mode: the active APF mode to configure for unicast packets
+ * @mcast_bcast_mode: the active APF mode to configure for multicast/broadcast
  *	packets
  */
-QDF_STATUS wmi_unified_set_active_bpf_mode_cmd(void *wmi_hdl,
-				uint8_t vdev_id,
-				enum wmi_host_active_bpf_mode ucast_mode,
-				enum wmi_host_active_bpf_mode mcast_bcast_mode);
+QDF_STATUS
+wmi_unified_set_active_apf_mode_cmd(void *wmi_hdl, uint8_t vdev_id,
+				    enum wmi_host_active_apf_mode ucast_mode,
+				    enum wmi_host_active_apf_mode
+							      mcast_bcast_mode);
 
 QDF_STATUS wmi_unified_stats_request_send(void *wmi_hdl,
 				uint8_t macaddr[IEEE80211_ADDR_LEN],
diff --git a/wmi_unified_param.h b/wmi_unified_param.h
index 151ecf47d3..c09784b9ce 100644
--- a/wmi_unified_param.h
+++ b/wmi_unified_param.h
@@ -5503,7 +5503,7 @@ typedef enum {
 	wmi_ap_ps_egap_info_event_id,
 	wmi_peer_assoc_conf_event_id,
 	wmi_vdev_delete_resp_event_id,
-	wmi_bpf_capability_info_event_id,
+	wmi_apf_capability_info_event_id,
 	wmi_vdev_encrypt_decrypt_data_rsp_event_id,
 	wmi_report_rx_aggr_failure_event_id,
 	wmi_pdev_chip_pwr_save_failure_detect_event_id,
@@ -5908,7 +5908,7 @@ typedef enum {
 	wmi_service_sta_pmf_offload,
 	wmi_service_unified_wow_capability,
 	wmi_service_enterprise_mesh,
-	wmi_service_bpf_offload,
+	wmi_service_apf_offload,
 	wmi_service_sync_delete_cmds,
 	wmi_service_ratectrl_limit_max_min_rates,
 	wmi_service_nan_data,
@@ -6065,7 +6065,7 @@ struct wmi_host_fw_abi_ver {
  * @num_packet_filters: maximum number of packet filter rules to support
  * @num_max_sta_vdevs: maximum number of concurrent station vdevs to support
  * @num_ns_ext_tuples_cfg:
- * @bpf_instruction_size:
+ * @apf_instruction_size:
  * @max_bssid_rx_filters:
  * @use_pdev_id:
  * @max_num_dbs_scan_duty_cycle: max dbs can duty cycle value
@@ -6140,7 +6140,7 @@ typedef struct {
 	uint32_t num_packet_filters;
 	uint32_t num_max_sta_vdevs;
 	uint32_t num_ns_ext_tuples_cfg;
-	uint32_t bpf_instruction_size;
+	uint32_t apf_instruction_size;
 	uint32_t max_bssid_rx_filters;
 	uint32_t use_pdev_id;
 	uint32_t max_num_dbs_scan_duty_cycle;
@@ -7943,16 +7943,16 @@ struct pdev_csa_switch_count_status {
 };
 
 /**
- * enum wmi_host_active-bpf_mode - FW_ACTIVE_BPF_MODE, replicated from FW header
- * @WMI_HOST_ACTIVE_BPF_DISABLED: BPF is disabled for all packets in active mode
- * @WMI_HOST_ACTIVE_BPF_ENABLED: BPF is enabled for all packets in active mode
- * @WMI_HOST_ACTIVE_BPF_ADAPTIVE: BPF is enabled for packets up to some
+ * enum wmi_host_active-apf_mode - FW_ACTIVE_APF_MODE, replicated from FW header
+ * @WMI_HOST_ACTIVE_APF_DISABLED: APF is disabled for all packets in active mode
+ * @WMI_HOST_ACTIVE_APF_ENABLED: APF is enabled for all packets in active mode
+ * @WMI_HOST_ACTIVE_APF_ADAPTIVE: APF is enabled for packets up to some
  *	threshold in active mode
  */
-enum wmi_host_active_bpf_mode {
-	WMI_HOST_ACTIVE_BPF_DISABLED =	(1 << 1),
-	WMI_HOST_ACTIVE_BPF_ENABLED =	(1 << 2),
-	WMI_HOST_ACTIVE_BPF_ADAPTIVE =	(1 << 3)
+enum wmi_host_active_apf_mode {
+	WMI_HOST_ACTIVE_APF_DISABLED =	(1 << 1),
+	WMI_HOST_ACTIVE_APF_ENABLED =	(1 << 2),
+	WMI_HOST_ACTIVE_APF_ADAPTIVE =	(1 << 3)
 };
 
 /**
diff --git a/wmi_unified_priv.h b/wmi_unified_priv.h
index ff2235bc22..5971f16972 100644
--- a/wmi_unified_priv.h
+++ b/wmi_unified_priv.h
@@ -811,10 +811,10 @@ QDF_STATUS (*send_get_buf_extscan_hotlist_cmd)(wmi_unified_t wmi_handle,
 				   struct ext_scan_setbssi_hotlist_params *
 				   photlist, int *buf_len);
 
-QDF_STATUS (*send_set_active_bpf_mode_cmd)(wmi_unified_t wmi_handle,
-				uint8_t vdev_id,
-				enum wmi_host_active_bpf_mode ucast_mode,
-				enum wmi_host_active_bpf_mode mcast_bcast_mode);
+QDF_STATUS
+(*send_set_active_apf_mode_cmd)(wmi_unified_t wmi_handle, uint8_t vdev_id,
+				enum wmi_host_active_apf_mode ucast_mode,
+				enum wmi_host_active_apf_mode mcast_bcast_mode);
 
 QDF_STATUS (*send_pdev_get_tpc_config_cmd)(wmi_unified_t wmi_handle,
 		uint32_t param);