diff --git a/Kbuild b/Kbuild
index 4c23c014bc..b11595480e 100644
--- a/Kbuild
+++ b/Kbuild
@@ -352,8 +352,8 @@ endif
 ifeq ($(CONFIG_FEATURE_MOTION_DETECTION), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_motion_detection.o
 endif
-ifeq ($(CONFIG_WLAN_SET_WLAN_DBG), y)
-HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_set_wlan_dbg.o
+ifeq ($(CONFIG_WLAN_SYSFS_WLAN_DBG), y)
+HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_wlan_dbg.o
 endif
 ifeq ($(CONFIG_WLAN_TXRX_FW_ST_RST), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_txrx_fw_st_rst.o
@@ -2646,7 +2646,7 @@ cppflags-$(CONFIG_WLAN_WOWL_ADD_PTRN) += -DCONFIG_WLAN_WOWL_ADD_PTRN
 cppflags-$(CONFIG_WLAN_WOWL_DEL_PTRN) += -DCONFIG_WLAN_WOWL_DEL_PTRN
 cppflags-$(CONFIG_WLAN_SYSFS_TX_STBC) += -DCONFIG_WLAN_SYSFS_TX_STBC
 cppflags-$(CONFIG_WLAN_GET_STATS) += -DCONFIG_WLAN_GET_STATS
-cppflags-$(CONFIG_WLAN_SET_WLAN_DBG) += -DCONFIG_WLAN_SET_WLAN_DBG
+cppflags-$(CONFIG_WLAN_SYSFS_WLAN_DBG) += -DCONFIG_WLAN_SYSFS_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_SYSFS_SCAN_CFG) += -DCONFIG_WLAN_SYSFS_SCAN_CFG
diff --git a/configs/default_defconfig b/configs/default_defconfig
index 8747d7f8ce..26ce8f5fb6 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -208,7 +208,7 @@ ifeq ($(CONFIG_WLAN_SYSFS), y)
 	CONFIG_WLAN_WOWL_DEL_PTRN := y
 	CONFIG_WLAN_SYSFS_TX_STBC := y
 	CONFIG_WLAN_GET_STATS := y
-	CONFIG_WLAN_SET_WLAN_DBG := y
+	CONFIG_WLAN_SYSFS_WLAN_DBG := y
 	CONFIG_WLAN_TXRX_FW_ST_RST := y
 	CONFIG_WLAN_GTX_BW_MASK := y
 	CONFIG_WLAN_SYSFS_SCAN_CFG := y
diff --git a/core/hdd/src/wlan_hdd_sysfs.c b/core/hdd/src/wlan_hdd_sysfs.c
index ee8355c6ad..1c9e59108c 100644
--- a/core/hdd/src/wlan_hdd_sysfs.c
+++ b/core/hdd/src/wlan_hdd_sysfs.c
@@ -54,7 +54,7 @@
 #include <wlan_hdd_sysfs_wowl_del_ptrn.h>
 #include <wlan_hdd_sysfs_tx_stbc.h>
 #include <wlan_hdd_sysfs_get_stats.h>
-#include <wlan_hdd_sysfs_set_wlan_dbg.h>
+#include <wlan_hdd_sysfs_wlan_dbg.h>
 #include <wlan_hdd_sysfs_txrx_fw_st_rst.h>
 #include <wlan_hdd_sysfs_gtx_bw_mask.h>
 #include <wlan_hdd_sysfs_scan_config.h>
@@ -775,7 +775,7 @@ void hdd_create_sysfs_files(struct hdd_context *hdd_ctx)
 		hdd_sysfs_fw_mode_config_create(driver_kobject);
 		hdd_sysfs_scan_disable_create(driver_kobject);
 		hdd_sysfs_wow_ito_create(driver_kobject);
-		hdd_sysfs_set_wlan_dbg_create(driver_kobject);
+		hdd_sysfs_wlan_dbg_create(driver_kobject);
 		hdd_sysfs_scan_config_create(driver_kobject);
 		hdd_sysfs_dp_trace_create(driver_kobject);
 		hdd_sysfs_thermal_cfg_create(driver_kobject);
@@ -798,7 +798,7 @@ void hdd_destroy_sysfs_files(void)
 		hdd_sysfs_thermal_cfg_destroy(driver_kobject);
 		hdd_sysfs_dp_trace_destroy(driver_kobject);
 		hdd_sysfs_scan_config_destroy(driver_kobject);
-		hdd_sysfs_set_wlan_dbg_destroy(driver_kobject);
+		hdd_sysfs_wlan_dbg_destroy(driver_kobject);
 		hdd_sysfs_wow_ito_destroy(driver_kobject);
 		hdd_sysfs_scan_disable_destroy(driver_kobject);
 		hdd_sysfs_fw_mode_config_destroy(driver_kobject);
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_wlan_dbg.c b/core/hdd/src/wlan_hdd_sysfs_wlan_dbg.c
similarity index 82%
rename from core/hdd/src/wlan_hdd_sysfs_set_wlan_dbg.c
rename to core/hdd/src/wlan_hdd_sysfs_wlan_dbg.c
index aee74af4d9..051be36434 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_wlan_dbg.c
+++ b/core/hdd/src/wlan_hdd_sysfs_wlan_dbg.c
@@ -15,19 +15,19 @@
  */
 
 /**
- * DOC: wlan_hdd_sysfs_set_wlan_dbg.c
+ * DOC: wlan_hdd_sysfs_wlan_dbg.c
  *
- * implementation for creating sysfs file wlan_dbg
+ * Implementation for creating sysfs file wlan_dbg
  */
 
 #include <wlan_hdd_includes.h>
 #include "osif_psoc_sync.h"
 #include <wlan_hdd_sysfs.h>
-#include <wlan_hdd_sysfs_set_wlan_dbg.h>
+#include <wlan_hdd_sysfs_wlan_dbg.h>
 
 static ssize_t
-__hdd_sysfs_set_wlan_dbg_store(struct hdd_context *hdd_ctx,
-			       struct kobj_attribute *attr,
+__hdd_sysfs_wlan_dbg_store(struct hdd_context *hdd_ctx,
+			   struct kobj_attribute *attr,
 			       const char *buf, size_t count)
 {
 	char buf_local[MAX_SYSFS_USER_COMMAND_SIZE_LENGTH + 1];
@@ -76,9 +76,9 @@ __hdd_sysfs_set_wlan_dbg_store(struct hdd_context *hdd_ctx,
 }
 
 static ssize_t
-hdd_sysfs_set_wlan_dbg_store(struct kobject *kobj,
-			     struct kobj_attribute *attr,
-			     const char *buf, size_t count)
+hdd_sysfs_wlan_dbg_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);
@@ -94,8 +94,8 @@ hdd_sysfs_set_wlan_dbg_store(struct kobject *kobj,
 	if (errno_size)
 		return errno_size;
 
-	errno_size = __hdd_sysfs_set_wlan_dbg_store(hdd_ctx, attr,
-						    buf, count);
+	errno_size = __hdd_sysfs_wlan_dbg_store(hdd_ctx, attr,
+						buf, count);
 
 	osif_psoc_sync_op_stop(psoc_sync);
 
@@ -104,9 +104,9 @@ hdd_sysfs_set_wlan_dbg_store(struct kobject *kobj,
 
 static struct kobj_attribute set_wlan_dbg_attribute =
 	__ATTR(wlan_dbg, 0220, NULL,
-	       hdd_sysfs_set_wlan_dbg_store);
+	       hdd_sysfs_wlan_dbg_store);
 
-int hdd_sysfs_set_wlan_dbg_create(struct kobject *driver_kobject)
+int hdd_sysfs_wlan_dbg_create(struct kobject *driver_kobject)
 {
 	int error;
 
@@ -124,7 +124,7 @@ int hdd_sysfs_set_wlan_dbg_create(struct kobject *driver_kobject)
 }
 
 void
-hdd_sysfs_set_wlan_dbg_destroy(struct kobject *driver_kobject)
+hdd_sysfs_wlan_dbg_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_wlan_dbg.h b/core/hdd/src/wlan_hdd_sysfs_wlan_dbg.h
similarity index 62%
rename from core/hdd/src/wlan_hdd_sysfs_set_wlan_dbg.h
rename to core/hdd/src/wlan_hdd_sysfs_wlan_dbg.h
index 1e7cc78e9b..0688580bf6 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_wlan_dbg.h
+++ b/core/hdd/src/wlan_hdd_sysfs_wlan_dbg.h
@@ -15,17 +15,17 @@
  */
 
 /**
- * DOC: wlan_hdd_sysfs_set_wlan_dbg.h
+ * DOC: wlan_hdd_sysfs_wlan_dbg.h
  *
- * implementation for creating sysfs file wlan_dbg
+ * Implementation for creating sysfs file wlan_dbg
  */
 
-#ifndef _WLAN_HDD_SYSFS_SET_WLAN_DBG_H
-#define _WLAN_HDD_SYSFS_SET_WLAN_DBG_H
+#ifndef _WLAN_HDD_SYSFS_WLAN_DBG_H
+#define _WLAN_HDD_SYSFS_WLAN_DBG_H
 
-#if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SET_WLAN_DBG)
+#if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SYSFS_WLAN_DBG)
 /**
- * hdd_sysfs_set_wlan_dbg_create() - API to create wlan_dbg sysfs file
+ * hdd_sysfs_wlan_dbg_create() - API to create wlan_dbg sysfs file
  * @driver_kobject: sysfs driver kobject
  *
  * file path: /sys/kernel/wifi/wlan_dbg
@@ -35,25 +35,25 @@
  *
  * Return: 0 on success and errno on failure
  */
-int hdd_sysfs_set_wlan_dbg_create(struct kobject *driver_kobject);
+int hdd_sysfs_wlan_dbg_create(struct kobject *driver_kobject);
 
 /**
- * hdd_sysfs_set_wlan_dbg_destroy() - API to destroy wlan_dbg sysfs file
+ * hdd_sysfs_wlan_dbg_destroy() - API to destroy wlan_dbg sysfs file
  *
  * Return: none
  */
 void
-hdd_sysfs_set_wlan_dbg_destroy(struct kobject *driver_kobject);
+hdd_sysfs_wlan_dbg_destroy(struct kobject *driver_kobject);
 #else
 static inline int
-hdd_sysfs_set_wlan_dbg_create(struct kobject *driver_kobject)
+hdd_sysfs_wlan_dbg_create(struct kobject *driver_kobject)
 {
 	return 0;
 }
 
 static inline void
-hdd_sysfs_set_wlan_dbg_destroy(struct kobject *driver_kobject)
+hdd_sysfs_wlan_dbg_destroy(struct kobject *driver_kobject)
 {
 }
 #endif
-#endif /* #ifndef _WLAN_HDD_SYSFS_SET_WLAN_DBG_H */
+#endif /* #ifndef _WLAN_HDD_SYSFS_WLAN_DBG_H */