diff --git a/inc/wlan_policy_mgr_api.h b/inc/wlan_policy_mgr_api.h
index 4dd3629ad843..301cd0c7c1c4 100644
--- a/inc/wlan_policy_mgr_api.h
+++ b/inc/wlan_policy_mgr_api.h
@@ -68,7 +68,7 @@ typedef const enum policy_mgr_conc_next_action
  * Return: NONE
  */
 void policy_mgr_set_concurrency_mode(struct wlan_objmgr_psoc *psoc,
-				     enum tQDF_ADAPTER_MODE mode);
+				     enum QDF_OPMODE mode);
 
 /**
  * policy_mgr_clear_concurrency_mode() - To clear concurrency mode
@@ -80,7 +80,7 @@ void policy_mgr_set_concurrency_mode(struct wlan_objmgr_psoc *psoc,
  * Return: NONE
  */
 void policy_mgr_clear_concurrency_mode(struct wlan_objmgr_psoc *psoc,
-				       enum tQDF_ADAPTER_MODE mode);
+				       enum QDF_OPMODE mode);
 
 /**
  * policy_mgr_get_connection_count() - provides the count of
@@ -192,7 +192,7 @@ bool policy_mgr_is_mcc_in_24G(struct wlan_objmgr_psoc *psoc);
  */
 QDF_STATUS policy_mgr_change_mcc_go_beacon_interval(
 		struct wlan_objmgr_psoc *psoc,
-		uint8_t vdev_id, enum tQDF_ADAPTER_MODE dev_mode);
+		uint8_t vdev_id, enum QDF_OPMODE dev_mode);
 
 #if defined(FEATURE_WLAN_MCC_TO_SCC_SWITCH)
 /**
@@ -233,7 +233,7 @@ static inline void policy_mgr_change_sap_channel_with_csa(
  * Return: None
  */
 void policy_mgr_incr_active_session(struct wlan_objmgr_psoc *psoc,
-		enum tQDF_ADAPTER_MODE mode, uint8_t sessionId);
+		enum QDF_OPMODE mode, uint8_t session_id);
 
 /**
  * policy_mgr_decr_active_session() - decrements the number of active sessions
@@ -248,7 +248,7 @@ void policy_mgr_incr_active_session(struct wlan_objmgr_psoc *psoc,
  * Return: QDF_STATUS
  */
 QDF_STATUS policy_mgr_decr_active_session(struct wlan_objmgr_psoc *psoc,
-		enum tQDF_ADAPTER_MODE mode, uint8_t sessionId);
+		enum QDF_OPMODE mode, uint8_t session_id);
 
 /**
  * policy_mgr_decr_session_set_pcl() - Decrement session count and set PCL
@@ -262,7 +262,7 @@ QDF_STATUS policy_mgr_decr_active_session(struct wlan_objmgr_psoc *psoc,
  * Return: None
  */
 void policy_mgr_decr_session_set_pcl(struct wlan_objmgr_psoc *psoc,
-		enum tQDF_ADAPTER_MODE mode, uint8_t session_id);
+		enum QDF_OPMODE mode, uint8_t session_id);
 
 /**
  * policy_mgr_get_channel() - provide channel number of given mode and vdevid
@@ -666,7 +666,7 @@ static inline QDF_STATUS policy_mgr_decr_connection_count_utfw(
  * Return: policy_mgr_con_mode enum
  */
 enum policy_mgr_con_mode policy_mgr_convert_device_mode_to_qdf_type(
-		enum tQDF_ADAPTER_MODE device_mode);
+		enum QDF_OPMODE device_mode);
 
 /**
  * policy_mgr_pdev_set_hw_mode() - Set HW mode command to FW
@@ -748,9 +748,9 @@ typedef void (*policy_mgr_nss_update_cback)(struct wlan_objmgr_psoc *psoc,
  */
 struct policy_mgr_sme_cbacks {
 	QDF_STATUS (*sme_get_valid_channels)(uint8_t *chan_list,
-		uint32_t *list_len);
-	void (*sme_get_nss_for_vdev)(enum tQDF_ADAPTER_MODE,
-		uint8_t *nss_2g, uint8_t *nss_5g);
+					     uint32_t *list_len);
+	void (*sme_get_nss_for_vdev)(enum QDF_OPMODE,
+				     uint8_t *nss_2g, uint8_t *nss_5g);
 	QDF_STATUS (*sme_soc_set_dual_mac_config)(
 		struct policy_mgr_dual_mac_config msg);
 	QDF_STATUS (*sme_pdev_set_hw_mode)(struct policy_mgr_hw_mode msg);
@@ -923,8 +923,8 @@ void policy_mgr_soc_set_dual_mac_cfg_cb(enum set_hw_mode_status status,
  *
  * Return: true or false
  */
-bool policy_mgr_map_concurrency_mode(enum tQDF_ADAPTER_MODE *old_mode,
-		enum policy_mgr_con_mode *new_mode);
+bool policy_mgr_map_concurrency_mode(enum QDF_OPMODE *old_mode,
+				     enum policy_mgr_con_mode *new_mode);
 
 /**
  * policy_mgr_get_channel_from_scan_result() - to get channel from scan result
diff --git a/src/wlan_policy_mgr_core.c b/src/wlan_policy_mgr_core.c
index 29f6069fad80..037ad11aa81b 100644
--- a/src/wlan_policy_mgr_core.c
+++ b/src/wlan_policy_mgr_core.c
@@ -1138,7 +1138,7 @@ void policy_mgr_dump_current_concurrency(struct wlan_objmgr_psoc *psoc)
  * Return: None
  */
 void policy_mgr_pdev_set_pcl(struct wlan_objmgr_psoc *psoc,
-				enum tQDF_ADAPTER_MODE mode)
+				enum QDF_OPMODE mode)
 {
 	QDF_STATUS status;
 	enum policy_mgr_con_mode con_mode;
@@ -1205,7 +1205,7 @@ void policy_mgr_set_pcl_for_existing_combo(
 {
 	struct policy_mgr_conc_connection_info
 			info[MAX_NUMBER_OF_CONC_CONNECTIONS] = { {0} };
-	enum tQDF_ADAPTER_MODE pcl_mode;
+	enum QDF_OPMODE pcl_mode;
 	uint8_t num_cxn_del = 0;
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
 
diff --git a/src/wlan_policy_mgr_get_set_utils.c b/src/wlan_policy_mgr_get_set_utils.c
index 42195ab01b87..3d11ab25cf00 100644
--- a/src/wlan_policy_mgr_get_set_utils.c
+++ b/src/wlan_policy_mgr_get_set_utils.c
@@ -1030,7 +1030,7 @@ bool policy_mgr_current_concurrency_is_mcc(struct wlan_objmgr_psoc *psoc)
  * Return: NONE
  */
 void policy_mgr_set_concurrency_mode(struct wlan_objmgr_psoc *psoc,
-				     enum tQDF_ADAPTER_MODE mode)
+				     enum QDF_OPMODE mode)
 {
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
 
@@ -1069,7 +1069,7 @@ void policy_mgr_set_concurrency_mode(struct wlan_objmgr_psoc *psoc,
  * Return: NONE
  */
 void policy_mgr_clear_concurrency_mode(struct wlan_objmgr_psoc *psoc,
-				       enum tQDF_ADAPTER_MODE mode)
+				       enum QDF_OPMODE mode)
 {
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
 
@@ -1099,7 +1099,7 @@ void policy_mgr_clear_concurrency_mode(struct wlan_objmgr_psoc *psoc,
 }
 
 void policy_mgr_incr_active_session(struct wlan_objmgr_psoc *psoc,
-				enum tQDF_ADAPTER_MODE mode,
+				enum QDF_OPMODE mode,
 				uint8_t session_id)
 {
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
@@ -1181,7 +1181,7 @@ void policy_mgr_incr_active_session(struct wlan_objmgr_psoc *psoc,
 }
 
 QDF_STATUS policy_mgr_decr_active_session(struct wlan_objmgr_psoc *psoc,
-				enum tQDF_ADAPTER_MODE mode,
+				enum QDF_OPMODE mode,
 				uint8_t session_id)
 {
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
@@ -1375,8 +1375,8 @@ QDF_STATUS policy_mgr_decr_connection_count(struct wlan_objmgr_psoc *psoc,
 	return QDF_STATUS_SUCCESS;
 }
 
-bool policy_mgr_map_concurrency_mode(enum tQDF_ADAPTER_MODE *old_mode,
-		enum policy_mgr_con_mode *new_mode)
+bool policy_mgr_map_concurrency_mode(enum QDF_OPMODE *old_mode,
+				     enum policy_mgr_con_mode *new_mode)
 {
 	bool status = true;
 
@@ -1985,7 +1985,7 @@ bool policy_mgr_is_mcc_adaptive_scheduler_enabled(
  */
 QDF_STATUS policy_mgr_change_mcc_go_beacon_interval(
 		struct wlan_objmgr_psoc *psoc,
-		uint8_t vdev_id, enum tQDF_ADAPTER_MODE dev_mode)
+		uint8_t vdev_id, enum QDF_OPMODE dev_mode)
 {
 	QDF_STATUS status;
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
@@ -2026,7 +2026,7 @@ struct policy_mgr_conc_connection_info *policy_mgr_get_conn_info(uint32_t *len)
 }
 
 enum policy_mgr_con_mode policy_mgr_convert_device_mode_to_qdf_type(
-			enum tQDF_ADAPTER_MODE device_mode)
+			enum QDF_OPMODE device_mode)
 {
 	enum policy_mgr_con_mode mode = PM_MAX_NUM_OF_MODE;
 	switch (device_mode) {
@@ -2200,7 +2200,7 @@ QDF_STATUS policy_mgr_get_nss_for_vdev(struct wlan_objmgr_psoc *psoc,
 				enum policy_mgr_con_mode mode,
 				uint8_t *nss_2g, uint8_t *nss_5g)
 {
-	enum tQDF_ADAPTER_MODE dev_mode;
+	enum QDF_OPMODE dev_mode;
 	struct policy_mgr_psoc_priv_obj *pm_ctx;
 
 	switch (mode) {
diff --git a/src/wlan_policy_mgr_i.h b/src/wlan_policy_mgr_i.h
index 0b058781d92b..17c83b42101d 100644
--- a/src/wlan_policy_mgr_i.h
+++ b/src/wlan_policy_mgr_i.h
@@ -372,7 +372,7 @@ void policy_mgr_pdev_set_hw_mode_cb(uint32_t status,
 				void *context);
 void policy_mgr_dump_current_concurrency(struct wlan_objmgr_psoc *psoc);
 void policy_mgr_pdev_set_pcl(struct wlan_objmgr_psoc *psoc,
-				enum tQDF_ADAPTER_MODE mode);
+				enum QDF_OPMODE mode);
 void policy_mgr_set_pcl_for_existing_combo(
 		struct wlan_objmgr_psoc *psoc, enum policy_mgr_con_mode mode);
 void pm_dbs_opportunistic_timer_handler(void *data);
diff --git a/src/wlan_policy_mgr_pcl.c b/src/wlan_policy_mgr_pcl.c
index 9a2092a0b8a6..3728d2a3adcb 100644
--- a/src/wlan_policy_mgr_pcl.c
+++ b/src/wlan_policy_mgr_pcl.c
@@ -105,7 +105,7 @@ QDF_STATUS policy_mgr_get_pcl_for_existing_conn(struct wlan_objmgr_psoc *psoc,
 }
 
 void policy_mgr_decr_session_set_pcl(struct wlan_objmgr_psoc *psoc,
-						enum tQDF_ADAPTER_MODE mode,
+						enum QDF_OPMODE mode,
 						uint8_t session_id)
 {
 	QDF_STATUS qdf_status;