diff --git a/Kbuild b/Kbuild
index 5cc3d6d49add..4e95b93ac6bc 100644
--- a/Kbuild
+++ b/Kbuild
@@ -316,8 +316,8 @@ endif
 ifeq ($(CONFIG_WLAN_SET_RANGE_EXT), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_set_range_ext.o
 endif
-ifeq ($(CONFIG_WLAN_SET_RADAR), y)
-HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_set_radar.o
+ifeq ($(CONFIG_WLAN_SYSFS_RADAR), y)
+HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_radar.o
 endif
 ifeq ($(CONFIG_WLAN_SYSFS_RTS_CTS), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_rts_cts.o
@@ -2651,7 +2651,7 @@ cppflags-$(CONFIG_WLAN_TXRX_FW_ST_RST) += -DCONFIG_WLAN_TXRX_FW_ST_RST
 cppflags-$(CONFIG_WLAN_GTX_BW_MASK) += -DCONFIG_WLAN_GTX_BW_MASK
 cppflags-$(CONFIG_WLAN_SET_SCAN_CFG) += -DCONFIG_WLAN_SET_SCAN_CFG
 cppflags-$(CONFIG_WLAN_SYSFS_MONITOR_MODE_CHANNEL) += -DCONFIG_WLAN_SYSFS_MONITOR_MODE_CHANNEL
-cppflags-$(CONFIG_WLAN_SET_RADAR) += -DCONFIG_WLAN_SET_RADAR
+cppflags-$(CONFIG_WLAN_SYSFS_RADAR) += -DCONFIG_WLAN_SYSFS_RADAR
 cppflags-$(CONFIG_WLAN_SYSFS_RTS_CTS) += -DWLAN_SYSFS_RTS_CTS
 cppflags-$(CONFIG_WLAN_TXRX_FW_STATS) += -DCONFIG_WLAN_TXRX_FW_STATS
 cppflags-$(CONFIG_WLAN_TXRX_STATS) += -DCONFIG_WLAN_TXRX_STATS
diff --git a/configs/default_defconfig b/configs/default_defconfig
index 7620bb2ebb4d..285d889affcc 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -213,7 +213,7 @@ ifeq ($(CONFIG_WLAN_SYSFS), y)
 	CONFIG_WLAN_GTX_BW_MASK := y
 	CONFIG_WLAN_SET_SCAN_CFG := y
 	CONFIG_WLAN_SYSFS_MONITOR_MODE_CHANNEL := y
-	CONFIG_WLAN_SET_RADAR := y
+	CONFIG_WLAN_SYSFS_RADAR := y
 	CONFIG_WLAN_SYSFS_RTS_CTS := y
 	CONFIG_WLAN_SYSFS_HE_BSS_COLOR := y
 	CONFIG_WLAN_TXRX_FW_STATS := y
diff --git a/core/hdd/src/wlan_hdd_sysfs.c b/core/hdd/src/wlan_hdd_sysfs.c
index 34cd947ea89d..3632db7e47d9 100644
--- a/core/hdd/src/wlan_hdd_sysfs.c
+++ b/core/hdd/src/wlan_hdd_sysfs.c
@@ -60,7 +60,7 @@
 #include <wlan_hdd_sysfs_set_scan_cfg.h>
 #include <wlan_hdd_sysfs_monitor_mode_channel.h>
 #include <wlan_hdd_sysfs_set_range_ext.h>
-#include <wlan_hdd_sysfs_set_radar.h>
+#include <wlan_hdd_sysfs_radar.h>
 #include <wlan_hdd_sysfs_rts_cts.h>
 #include <wlan_hdd_sysfs_he_bss_color.h>
 #include <wlan_hdd_sysfs_txrx_fw_stats.h>
@@ -715,7 +715,7 @@ hdd_sysfs_create_sap_adapter_root_obj(struct hdd_adapter *adapter)
 	hdd_sysfs_txrx_fw_st_rst_create(adapter);
 	hdd_sysfs_gtx_bw_mask_create(adapter);
 	hdd_sysfs_dcm_create(adapter);
-	hdd_sysfs_set_radar_create(adapter);
+	hdd_sysfs_radar_create(adapter);
 	hdd_sysfs_rts_cts_create(adapter);
 	hdd_sysfs_stats_create(adapter);
 	hdd_sysfs_he_bss_color_create(adapter);
@@ -737,7 +737,7 @@ hdd_sysfs_destroy_sap_adapter_root_obj(struct hdd_adapter *adapter)
 	hdd_sysfs_he_bss_color_destroy(adapter);
 	hdd_sysfs_stats_destroy(adapter);
 	hdd_sysfs_rts_cts_destroy(adapter);
-	hdd_sysfs_set_radar_destroy(adapter);
+	hdd_sysfs_radar_destroy(adapter);
 	hdd_sysfs_dcm_destroy(adapter);
 	hdd_sysfs_gtx_bw_mask_destroy(adapter);
 	hdd_sysfs_txrx_fw_st_rst_destroy(adapter);
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_radar.c b/core/hdd/src/wlan_hdd_sysfs_radar.c
similarity index 84%
rename from core/hdd/src/wlan_hdd_sysfs_set_radar.c
rename to core/hdd/src/wlan_hdd_sysfs_radar.c
index 7e5d58c4b34d..9c65c9960f6a 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_radar.c
+++ b/core/hdd/src/wlan_hdd_sysfs_radar.c
@@ -15,20 +15,20 @@
  */
 
 /**
- * DOC: wlan_hdd_sysfs_set_radar.c
+ * DOC: wlan_hdd_sysfs_radar.c
  *
- * implementation for creating sysfs file radar
+ * Implementation for creating sysfs file radar
  */
 
 #include <wlan_hdd_includes.h>
 #include "osif_vdev_sync.h"
 #include <wlan_hdd_sysfs.h>
-#include <wlan_hdd_sysfs_set_radar.h>
+#include <wlan_hdd_sysfs_radar.h>
 #include "wlan_dfs_tgt_api.h"
 
 static ssize_t
-__hdd_sysfs_set_radar_store(struct net_device *net_dev,
-			    char const *buf, size_t count)
+__hdd_sysfs_radar_store(struct net_device *net_dev,
+			char const *buf, size_t count)
 {
 	struct hdd_adapter *adapter = netdev_priv(net_dev);
 	struct hdd_ap_ctx *ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter);
@@ -91,9 +91,9 @@ __hdd_sysfs_set_radar_store(struct net_device *net_dev,
 }
 
 static ssize_t
-hdd_sysfs_set_radar_store(struct device *dev,
-			  struct device_attribute *attr,
-			  char const *buf, size_t count)
+hdd_sysfs_radar_store(struct device *dev,
+		      struct device_attribute *attr,
+		      char const *buf, size_t count)
 {
 	struct net_device *net_dev = container_of(dev, struct net_device, dev);
 	struct osif_vdev_sync *vdev_sync;
@@ -103,7 +103,7 @@ hdd_sysfs_set_radar_store(struct device *dev,
 	if (errno_size)
 		return errno_size;
 
-	errno_size = __hdd_sysfs_set_radar_store(net_dev, buf, count);
+	errno_size = __hdd_sysfs_radar_store(net_dev, buf, count);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -111,9 +111,9 @@ hdd_sysfs_set_radar_store(struct device *dev,
 }
 
 static DEVICE_ATTR(radar, 0220,
-		   NULL, hdd_sysfs_set_radar_store);
+		   NULL, hdd_sysfs_radar_store);
 
-int hdd_sysfs_set_radar_create(struct hdd_adapter *adapter)
+int hdd_sysfs_radar_create(struct hdd_adapter *adapter)
 {
 	int error;
 
@@ -124,7 +124,7 @@ int hdd_sysfs_set_radar_create(struct hdd_adapter *adapter)
 	return error;
 }
 
-void hdd_sysfs_set_radar_destroy(struct hdd_adapter *adapter)
+void hdd_sysfs_radar_destroy(struct hdd_adapter *adapter)
 {
 	device_remove_file(&adapter->dev->dev, &dev_attr_radar);
 }
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_radar.h b/core/hdd/src/wlan_hdd_sysfs_radar.h
similarity index 70%
rename from core/hdd/src/wlan_hdd_sysfs_set_radar.h
rename to core/hdd/src/wlan_hdd_sysfs_radar.h
index 3fe89b72d4f5..3321b64e5e6d 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_radar.h
+++ b/core/hdd/src/wlan_hdd_sysfs_radar.h
@@ -15,17 +15,17 @@
  */
 
 /**
- * DOC: wlan_hdd_sysfs_set_radar.h
+ * DOC: wlan_hdd_sysfs_radar.h
  *
  * implementation for creating sysfs file radar
  */
 
-#ifndef _WLAN_HDD_SYSFS_SET_RADAR_H
-#define _WLAN_HDD_SYSFS_SET_RADAR_H
+#ifndef _WLAN_HDD_SYSFS_RADAR_H
+#define _WLAN_HDD_SYSFS_RADAR_H
 
-#if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SET_RADAR)
+#if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SYSFS_RADAR)
 /**
- * wlan_hdd_sysfs_set_radar_create() - API to create radar sysfs file
+ * wlan_hdd_sysfs_radar_create() - API to create radar sysfs file
  * (for sap mode only)
  * @adapter: hdd adapter
  *
@@ -37,26 +37,26 @@
  *
  * Return: 0 on success and errno on failure
  */
-int hdd_sysfs_set_radar_create(struct hdd_adapter *adapter);
+int hdd_sysfs_radar_create(struct hdd_adapter *adapter);
 
 /**
- * hdd_sysfs_set_radar_destroy() -
+ * hdd_sysfs_radar_destroy() -
  *   API to destroy radar sysfs file
  * @adapter: pointer to adapter
  *
  * Return: none
  */
-void hdd_sysfs_set_radar_destroy(struct hdd_adapter *adapter);
+void hdd_sysfs_radar_destroy(struct hdd_adapter *adapter);
 #else
 static inline int
-hdd_sysfs_set_radar_create(struct hdd_adapter *adapter)
+hdd_sysfs_radar_create(struct hdd_adapter *adapter)
 {
 	return 0;
 }
 
 static inline void
-hdd_sysfs_set_radar_destroy(struct hdd_adapter *adapter)
+hdd_sysfs_radar_destroy(struct hdd_adapter *adapter)
 {
 }
 #endif
-#endif /* #ifndef _WLAN_HDD_SYSFS_SET_RADAR_H */
+#endif /* #ifndef _WLAN_HDD_SYSFS_RADAR_H */