diff --git a/umac/dfs/core/src/dfs_channel.h b/umac/dfs/core/src/dfs_channel.h
index 18c035d381..e485bb8b28 100644
--- a/umac/dfs/core/src/dfs_channel.h
+++ b/umac/dfs/core/src/dfs_channel.h
@@ -1,6 +1,7 @@
 /*
  * Copyright (c) 2016-2018,2020-2021 The Linux Foundation. All rights reserved.
  * Copyright (c) 2008 Atheros Communications, Inc.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -795,10 +796,10 @@
 /* if channel has been checked for DFS */
 #define WLAN_CHAN_DFS_CLEAR        0x0008
 
-/* DFS radar history for slave device(STA mode) */
+/* DFS radar history for client device(STA mode) */
 #define WLAN_CHAN_HISTORY_RADAR    0x0100
 
-/* DFS CAC valid for  slave device(STA mode) */
+/* DFS CAC valid for  client device(STA mode) */
 #define WLAN_CHAN_CAC_VALID        0x0200
 
 #define WLAN_IS_CHAN_DFS(_c) \
diff --git a/wmi/inc/wmi_unified_param.h b/wmi/inc/wmi_unified_param.h
index 13b251ac05..5e33e8eabf 100644
--- a/wmi/inc/wmi_unified_param.h
+++ b/wmi/inc/wmi_unified_param.h
@@ -4600,12 +4600,12 @@ struct ftm_time_sync_start_stop_params {
 /**
  * struct wlan_time_sync_qtime_pair- Get wlan time sync qtime pair value
  * @vdev_id: vdev id
- * @qtime_master: qtimer value of master
- * @qtime_slave: qtimer value of slave
+ * @qtime_initiator: qtimer value of initiator
+ * @qtime_target: qtimer value of target
  */
 struct wlan_time_sync_qtime_pair {
-	uint64_t qtime_master;
-	uint64_t qtime_slave;
+	uint64_t qtime_initiator;
+	uint64_t qtime_target;
 };
 
 /**
@@ -4902,7 +4902,7 @@ typedef enum {
 	wmi_roam_pmkid_request_event_id,
 #ifdef FEATURE_WLAN_TIME_SYNC_FTM
 	wmi_wlan_time_sync_ftm_start_stop_event_id,
-	wmi_wlan_time_sync_q_master_slave_offset_eventid,
+	wmi_wlan_time_sync_q_initiator_target_offset_eventid,
 #endif
 	wmi_roam_scan_chan_list_id,
 	wmi_muedca_params_config_eventid,
diff --git a/wmi/src/wmi_unified_tlv.c b/wmi/src/wmi_unified_tlv.c
index adbfd1b8ec..e1df6386fc 100644
--- a/wmi/src/wmi_unified_tlv.c
+++ b/wmi/src/wmi_unified_tlv.c
@@ -16770,10 +16770,10 @@ extract_time_sync_ftm_offset_event_tlv(wmi_unified_t wmi, void *buf,
 	}
 
 	for (iter = 0; iter < param->num_qtime; iter++) {
-		param->pairs[iter].qtime_master = (
+		param->pairs[iter].qtime_initiator = (
 			(uint64_t)q_pair[iter].qmaster_u32 << 32) |
 			 q_pair[iter].qmaster_l32;
-		param->pairs[iter].qtime_slave = (
+		param->pairs[iter].qtime_target = (
 			(uint64_t)q_pair[iter].qslave_u32 << 32) |
 			 q_pair[iter].qslave_l32;
 	}
@@ -18257,7 +18257,7 @@ static void populate_tlv_events_id(uint32_t *event_ids)
 #ifdef FEATURE_WLAN_TIME_SYNC_FTM
 	event_ids[wmi_wlan_time_sync_ftm_start_stop_event_id] =
 				WMI_VDEV_AUDIO_SYNC_START_STOP_EVENTID;
-	event_ids[wmi_wlan_time_sync_q_master_slave_offset_eventid] =
+	event_ids[wmi_wlan_time_sync_q_initiator_target_offset_eventid] =
 			WMI_VDEV_AUDIO_SYNC_Q_MASTER_SLAVE_OFFSET_EVENTID;
 #endif
 event_ids[wmi_roam_scan_chan_list_id] =