diff --git a/Kbuild b/Kbuild
index b9b9efaae1f7..921ed8b67fe3 100644
--- a/Kbuild
+++ b/Kbuild
@@ -310,8 +310,8 @@ endif
 ifeq ($(CONFIG_WLAN_SET_SCAN_CFG), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_set_scan_cfg.o
 endif
-ifeq ($(CONFIG_WLAN_SET_MON_CHAN), y)
-HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_set_mon_chan.o
+ifeq ($(CONFIG_WLAN_SYSFS_MONITOR_MODE_CHANNEL), y)
+HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_monitor_mode_channel.o
 endif
 ifeq ($(CONFIG_WLAN_SET_RANGE_EXT), y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_sysfs_set_range_ext.o
@@ -2650,7 +2650,7 @@ 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_SET_MON_CHAN) += -DCONFIG_WLAN_SET_MON_CHAN
+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_RTS_CTS) += -DWLAN_SYSFS_RTS_CTS
 cppflags-$(CONFIG_WLAN_TXRX_FW_STATS) += -DCONFIG_WLAN_TXRX_FW_STATS
diff --git a/configs/default_defconfig b/configs/default_defconfig
index ac1ce8a9a9d6..918509e21c8b 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -212,7 +212,7 @@ ifeq ($(CONFIG_WLAN_SYSFS), y)
 	CONFIG_WLAN_TXRX_FW_ST_RST := y
 	CONFIG_WLAN_GTX_BW_MASK := y
 	CONFIG_WLAN_SET_SCAN_CFG := y
-	CONFIG_WLAN_SET_MON_CHAN := y
+	CONFIG_WLAN_SYSFS_MONITOR_MODE_CHANNEL := y
 	CONFIG_WLAN_SET_RADAR := y
 	CONFIG_WLAN_SYSFS_RTS_CTS := y
 	CONFIG_WLAN_SYSFS_HE_BSS_COLOR := y
diff --git a/core/hdd/src/wlan_hdd_sysfs.c b/core/hdd/src/wlan_hdd_sysfs.c
index 09fc1c4f055c..02b10da19add 100644
--- a/core/hdd/src/wlan_hdd_sysfs.c
+++ b/core/hdd/src/wlan_hdd_sysfs.c
@@ -58,7 +58,7 @@
 #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_set_mon_chan.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_rts_cts.h>
@@ -756,13 +756,13 @@ hdd_sysfs_destroy_sap_adapter_root_obj(struct hdd_adapter *adapter)
 static void
 hdd_sysfs_create_monitor_adapter_root_obj(struct hdd_adapter *adapter)
 {
-	hdd_sysfs_set_mon_chan_create(adapter);
+	hdd_sysfs_monitor_mode_channel_create(adapter);
 }
 
 static void
 hdd_sysfs_destroy_monitor_adapter_root_obj(struct hdd_adapter *adapter)
 {
-	hdd_sysfs_set_mon_chan_destroy(adapter);
+	hdd_sysfs_monitor_mode_channel_destroy(adapter);
 }
 
 void hdd_create_sysfs_files(struct hdd_context *hdd_ctx)
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_mon_chan.c b/core/hdd/src/wlan_hdd_sysfs_monitor_mode_channel.c
similarity index 77%
rename from core/hdd/src/wlan_hdd_sysfs_set_mon_chan.c
rename to core/hdd/src/wlan_hdd_sysfs_monitor_mode_channel.c
index ccadd0e88dec..1c16f770e661 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_mon_chan.c
+++ b/core/hdd/src/wlan_hdd_sysfs_monitor_mode_channel.c
@@ -17,19 +17,19 @@
  */
 
 /**
- * DOC: wlan_hdd_sysfs_set_mon_chan.c
+ * DOC: wlan_hdd_sysfs_monitor_mode_channel.c
  *
- * implementation for creating sysfs file monitor_mode_channel
+ * Implementation for creating sysfs file monitor_mode_channel
  */
 
 #include <wlan_hdd_includes.h>
 #include "osif_vdev_sync.h"
 #include <wlan_hdd_sysfs.h>
-#include <wlan_hdd_sysfs_set_mon_chan.h>
+#include <wlan_hdd_sysfs_monitor_mode_channel.h>
 
 static ssize_t
-__hdd_sysfs_set_mon_chan_store(struct net_device *net_dev,
-			       char const *buf, size_t count)
+__hdd_sysfs_monitor_mode_channel_store(struct net_device *net_dev,
+				       char const *buf, size_t count)
 {
 	struct hdd_adapter *adapter = netdev_priv(net_dev);
 	char buf_local[MAX_SYSFS_USER_COMMAND_SIZE_LENGTH + 1];
@@ -89,9 +89,9 @@ __hdd_sysfs_set_mon_chan_store(struct net_device *net_dev,
 }
 
 static ssize_t
-hdd_sysfs_set_mon_chan_store(struct device *dev,
-			     struct device_attribute *attr,
-			     char const *buf, size_t count)
+hdd_sysfs_monitor_mode_channel_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;
@@ -101,7 +101,8 @@ hdd_sysfs_set_mon_chan_store(struct device *dev,
 	if (errno_size)
 		return errno_size;
 
-	errno_size = __hdd_sysfs_set_mon_chan_store(net_dev, buf, count);
+	errno_size = __hdd_sysfs_monitor_mode_channel_store(net_dev,
+							    buf, count);
 
 	osif_vdev_sync_op_stop(vdev_sync);
 
@@ -109,20 +110,21 @@ hdd_sysfs_set_mon_chan_store(struct device *dev,
 }
 
 static DEVICE_ATTR(monitor_mode_channel, 0220,
-		   NULL, hdd_sysfs_set_mon_chan_store);
+		   NULL, hdd_sysfs_monitor_mode_channel_store);
 
-int hdd_sysfs_set_mon_chan_create(struct hdd_adapter *adapter)
+int hdd_sysfs_monitor_mode_channel_create(struct hdd_adapter *adapter)
 {
 	int error;
 
-	error = device_create_file(&adapter->dev->dev, &dev_attr_monitor_mode_channel);
+	error = device_create_file(&adapter->dev->dev,
+				   &dev_attr_monitor_mode_channel);
 	if (error)
 		hdd_err("could not create monitor_mode_channel sysfs file");
 
 	return error;
 }
 
-void hdd_sysfs_set_mon_chan_destroy(struct hdd_adapter *adapter)
+void hdd_sysfs_monitor_mode_channel_destroy(struct hdd_adapter *adapter)
 {
 	device_remove_file(&adapter->dev->dev, &dev_attr_monitor_mode_channel);
 }
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_mon_chan.h b/core/hdd/src/wlan_hdd_sysfs_monitor_mode_channel.h
similarity index 63%
rename from core/hdd/src/wlan_hdd_sysfs_set_mon_chan.h
rename to core/hdd/src/wlan_hdd_sysfs_monitor_mode_channel.h
index c3208edd6692..a62ee3c0eb54 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_mon_chan.h
+++ b/core/hdd/src/wlan_hdd_sysfs_monitor_mode_channel.h
@@ -17,17 +17,18 @@
  */
 
 /**
- * DOC: wlan_hdd_sysfs_set_mon_chan.h
+ * DOC: wlan_hdd_sysfs_monitor_mode_channel.h
  *
- * implementation for creating sysfs file monitor_mode_channel
+ * Implementation for creating sysfs file monitor_mode_channel
  */
 
-#ifndef _WLAN_HDD_SYSFS_SET_MON_CHAN_H
-#define _WLAN_HDD_SYSFS_SET_MON_CHAN_H
+#ifndef _WLAN_HDD_SYSFS_MONITOR_MODE_CHANNEL_H
+#define _WLAN_HDD_SYSFS_MONITOR_MODE_CHANNEL_H
 
-#if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SET_MON_CHAN)
+#if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SYSFS_MONITOR_MODE_CHANNEL)
 /**
- * wlan_hdd_sysfs_set_mon_chan_create() - API to create monitor_mode_channel
+ * hdd_sysfs_monitor_mode_channel_create() -
+ *  API to create monitor_mode_channel
  * @adapter: hdd adapter
  *
  * this file is created per adapter.
@@ -38,26 +39,26 @@
  *
  * Return: 0 on success and errno on failure
  */
-int hdd_sysfs_set_mon_chan_create(struct hdd_adapter *adapter);
+int hdd_sysfs_monitor_mode_channel_create(struct hdd_adapter *adapter);
 
 /**
- * hdd_sysfs_set_mon_chan_destroy() -
+ * hdd_sysfs_monitor_mode_channel_destroy() -
  *   API to destroy monitor_mode_channel sysfs file
  * @adapter: pointer to adapter
  *
  * Return: none
  */
-void hdd_sysfs_set_mon_chan_destroy(struct hdd_adapter *adapter);
+void hdd_sysfs_monitor_mode_channel_destroy(struct hdd_adapter *adapter);
 #else
 static inline int
-hdd_sysfs_set_mon_chan_create(struct hdd_adapter *adapter)
+hdd_sysfs_monitor_mode_channel_create(struct hdd_adapter *adapter)
 {
 	return 0;
 }
 
 static inline void
-hdd_sysfs_set_mon_chan_destroy(struct hdd_adapter *adapter)
+hdd_sysfs_monitor_mode_channel_destroy(struct hdd_adapter *adapter)
 {
 }
 #endif
-#endif /* #ifndef _WLAN_HDD_SYSFS_SET_MON_CHAN_H */
+#endif /* #ifndef _WLAN_HDD_SYSFS_MONITOR_MODE_CHANNEL_H */