diff --git a/Kbuild b/Kbuild
index 4e95b93ac6bc..3548d8141e48 100644
--- a/Kbuild
+++ b/Kbuild
@@ -307,8 +307,8 @@ endif
 ifeq ($(CONFIG_WLAN_GET_STATS), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_get_stats.o
 endif
-ifeq ($(CONFIG_WLAN_SET_SCAN_CFG), y)
-HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_set_scan_cfg.o
+ifeq ($(CONFIG_WLAN_SYSFS_SCAN_CFG), y)
+HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_scan_config.o
 endif
 ifeq ($(CONFIG_WLAN_SYSFS_MONITOR_MODE_CHANNEL), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_monitor_mode_channel.o
@@ -2649,7 +2649,7 @@ cppflags-$(CONFIG_WLAN_GET_STATS) += -DCONFIG_WLAN_GET_STATS
 cppflags-$(CONFIG_WLAN_SET_WLAN_DBG) += -DCONFIG_WLAN_SET_WLAN_DBG
 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_SCAN_CFG) += -DCONFIG_WLAN_SYSFS_SCAN_CFG
 cppflags-$(CONFIG_WLAN_SYSFS_MONITOR_MODE_CHANNEL) += -DCONFIG_WLAN_SYSFS_MONITOR_MODE_CHANNEL
 cppflags-$(CONFIG_WLAN_SYSFS_RADAR) += -DCONFIG_WLAN_SYSFS_RADAR
 cppflags-$(CONFIG_WLAN_SYSFS_RTS_CTS) += -DWLAN_SYSFS_RTS_CTS
diff --git a/configs/default_defconfig b/configs/default_defconfig
index 285d889affcc..33b0a2131bf3 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -211,7 +211,7 @@ ifeq ($(CONFIG_WLAN_SYSFS), y)
 	CONFIG_WLAN_SET_WLAN_DBG := y
 	CONFIG_WLAN_TXRX_FW_ST_RST := y
 	CONFIG_WLAN_GTX_BW_MASK := y
-	CONFIG_WLAN_SET_SCAN_CFG := y
+	CONFIG_WLAN_SYSFS_SCAN_CFG := y
 	CONFIG_WLAN_SYSFS_MONITOR_MODE_CHANNEL := y
 	CONFIG_WLAN_SYSFS_RADAR := y
 	CONFIG_WLAN_SYSFS_RTS_CTS := y
diff --git a/core/hdd/src/wlan_hdd_sysfs.c b/core/hdd/src/wlan_hdd_sysfs.c
index 3632db7e47d9..8277530ce02a 100644
--- a/core/hdd/src/wlan_hdd_sysfs.c
+++ b/core/hdd/src/wlan_hdd_sysfs.c
@@ -57,7 +57,7 @@
 #include <wlan_hdd_sysfs_set_wlan_dbg.h>
 #include <wlan_hdd_sysfs_txrx_fw_st_rst.h>
 #include <wlan_hdd_sysfs_gtx_bw_mask.h>
-#include <wlan_hdd_sysfs_set_scan_cfg.h>
+#include <wlan_hdd_sysfs_scan_config.h>
 #include <wlan_hdd_sysfs_monitor_mode_channel.h>
 #include <wlan_hdd_sysfs_set_range_ext.h>
 #include <wlan_hdd_sysfs_radar.h>
@@ -776,7 +776,7 @@ void hdd_create_sysfs_files(struct hdd_context *hdd_ctx)
 		hdd_sysfs_scan_disable_create(driver_kobject);
 		hdd_sysfs_wow_ito_create(driver_kobject);
 		hdd_sysfs_set_wlan_dbg_create(driver_kobject);
-		hdd_sysfs_set_scan_cfg_create(driver_kobject);
+		hdd_sysfs_scan_config_create(driver_kobject);
 		hdd_sysfs_dp_trace_create(driver_kobject);
 		hdd_sysfs_thermal_cfg_create(driver_kobject);
 		hdd_sysfs_pktlog_create(driver_kobject);
@@ -797,7 +797,7 @@ void hdd_destroy_sysfs_files(void)
 		hdd_sysfs_pktlog_destroy(driver_kobject);
 		hdd_sysfs_thermal_cfg_destroy(driver_kobject);
 		hdd_sysfs_dp_trace_destroy(driver_kobject);
-		hdd_sysfs_set_scan_cfg_destroy(driver_kobject);
+		hdd_sysfs_scan_config_destroy(driver_kobject);
 		hdd_sysfs_set_wlan_dbg_destroy(driver_kobject);
 		hdd_sysfs_wow_ito_destroy(driver_kobject);
 		hdd_sysfs_scan_disable_destroy(driver_kobject);
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.c b/core/hdd/src/wlan_hdd_sysfs_scan_config.c
similarity index 84%
rename from core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.c
rename to core/hdd/src/wlan_hdd_sysfs_scan_config.c
index be6e99e85491..9d9c09eb723c 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.c
+++ b/core/hdd/src/wlan_hdd_sysfs_scan_config.c
@@ -15,20 +15,20 @@
  */
 
 /**
- * DOC: wlan_hdd_sysfs_set_scan_cfg.c
+ * DOC: wlan_hdd_sysfs_scan_config.c
  *
- * implementation for creating sysfs file scan_config
+ * Implementation for creating sysfs file scan_config
  */
 
 #include <wlan_hdd_includes.h>
 #include "osif_psoc_sync.h"
 #include <wlan_hdd_sysfs.h>
-#include <wlan_hdd_sysfs_set_scan_cfg.h>
+#include <wlan_hdd_sysfs_scan_config.h>
 #include "wlan_policy_mgr_ucfg.h"
 
 static ssize_t
-__hdd_sysfs_set_scan_cfg_store(struct hdd_context *hdd_ctx,
-			       struct kobj_attribute *attr,
+__hdd_sysfs_scan_config_store(struct hdd_context *hdd_ctx,
+			      struct kobj_attribute *attr,
 			       const char *buf,
 			       size_t count)
 {
@@ -92,10 +92,10 @@ __hdd_sysfs_set_scan_cfg_store(struct hdd_context *hdd_ctx,
 }
 
 static ssize_t
-hdd_sysfs_set_scan_cfg_store(struct kobject *kobj,
-			     struct kobj_attribute *attr,
-			     const char *buf,
-			     size_t count)
+hdd_sysfs_scan_config_store(struct kobject *kobj,
+			    struct kobj_attribute *attr,
+			    const char *buf,
+			    size_t count)
 {
 	struct osif_psoc_sync *psoc_sync;
 	struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
@@ -111,8 +111,8 @@ hdd_sysfs_set_scan_cfg_store(struct kobject *kobj,
 	if (errno_size)
 		return errno_size;
 
-	errno_size = __hdd_sysfs_set_scan_cfg_store(hdd_ctx, attr,
-						    buf, count);
+	errno_size = __hdd_sysfs_scan_config_store(hdd_ctx, attr,
+						   buf, count);
 
 	osif_psoc_sync_op_stop(psoc_sync);
 
@@ -121,9 +121,9 @@ hdd_sysfs_set_scan_cfg_store(struct kobject *kobj,
 
 static struct kobj_attribute set_scan_cfg_attribute =
 	__ATTR(scan_config, 0220, NULL,
-	       hdd_sysfs_set_scan_cfg_store);
+	       hdd_sysfs_scan_config_store);
 
-int hdd_sysfs_set_scan_cfg_create(struct kobject *driver_kobject)
+int hdd_sysfs_scan_config_create(struct kobject *driver_kobject)
 {
 	int error;
 
@@ -141,7 +141,7 @@ int hdd_sysfs_set_scan_cfg_create(struct kobject *driver_kobject)
 }
 
 void
-hdd_sysfs_set_scan_cfg_destroy(struct kobject *driver_kobject)
+hdd_sysfs_scan_config_destroy(struct kobject *driver_kobject)
 {
 	if (!driver_kobject) {
 		hdd_err("could not get driver kobject!");
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.h b/core/hdd/src/wlan_hdd_sysfs_scan_config.h
similarity index 67%
rename from core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.h
rename to core/hdd/src/wlan_hdd_sysfs_scan_config.h
index e60911425639..c953e69bb7e7 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.h
+++ b/core/hdd/src/wlan_hdd_sysfs_scan_config.h
@@ -15,17 +15,17 @@
  */
 
 /**
- * DOC: wlan_hdd_sysfs_set_scan_cfg.h
+ * DOC: wlan_hdd_sysfs_scan_config.h
  *
  * implementation for creating sysfs file scan_config
  */
 
-#ifndef _WLAN_HDD_SYSFS_SET_SCAN_CFG_H
-#define _WLAN_HDD_SYSFS_SET_SCAN_CFG_H
+#ifndef _WLAN_HDD_SYSFS_SCAN_CONFIG_H
+#define _WLAN_HDD_SYSFS_SCAN_CONFIG_H
 
-#if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SET_SCAN_CFG)
+#if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SYSFS_SCAN_CFG)
 /**
- * hdd_sysfs_set_scan_cfg_create() - API to create scan_config sysfs file
+ * hdd_sysfs_scan_config_create() - API to create scan_config sysfs file
  * @driver_kobject: sysfs driver kobject
  *
  * file path: /sys/kernel/wifi/scan_config
@@ -35,26 +35,26 @@
  *
  * Return: 0 on success and errno on failure
  */
-int hdd_sysfs_set_scan_cfg_create(struct kobject *driver_kobject);
+int hdd_sysfs_scan_config_create(struct kobject *driver_kobject);
 
 /**
- * hdd_sysfs_set_scan_cfg_destroy() -
+ * hdd_sysfs_scan_config_destroy() -
  *   API to destroy scan_config sysfs file
  *
  * Return: none
  */
 void
-hdd_sysfs_set_scan_cfg_destroy(struct kobject *driver_kobject);
+hdd_sysfs_scan_config_destroy(struct kobject *driver_kobject);
 #else
 static inline int
-hdd_sysfs_set_scan_cfg_create(struct kobject *driver_kobject)
+hdd_sysfs_scan_config_create(struct kobject *driver_kobject)
 {
 	return 0;
 }
 
 static inline void
-hdd_sysfs_set_scan_cfg_destroy(struct kobject *driver_kobject)
+hdd_sysfs_scan_config_destroy(struct kobject *driver_kobject)
 {
 }
 #endif
-#endif /* #ifndef _WLAN_HDD_SYSFS_SET_SCAN_CFG_H */
+#endif /* #ifndef _WLAN_HDD_SYSFS_SCAN_CONFIG_H */