diff --git a/core/hdd/inc/wlan_hdd_sysfs_get_channel.h b/core/hdd/inc/wlan_hdd_sysfs_get_channel.h
index f52d986a00..2b4691b7a4 100644
--- a/core/hdd/inc/wlan_hdd_sysfs_get_channel.h
+++ b/core/hdd/inc/wlan_hdd_sysfs_get_channel.h
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_get_channel.h
  *
- * implementation for creating sysfs file get_channel
+ * implementation for creating sysfs file channel
  */
 
 #ifndef _WLAN_HDD_SYSFS_GET_CHANNEL_H
@@ -25,22 +25,22 @@
 
 #if defined(WLAN_SYSFS) && defined(WLAN_SYSFS_GET_CHANNEL)
 /**
- * hdd_sysfs_get_channel_interface_create() - API to create get_channel sysfs
+ * hdd_sysfs_get_channel_interface_create() - API to create channel sysfs
  * @adapter: pointer to adapter
  *
  * this file is created for SAP adapter.
- * file path: /sys/class/net/wlanxx/get_channel
+ * file path: /sys/class/net/wlanxx/channel
  *	where wlanxx is adapter name
  *
  * usage:
- *      cat /sys/class/net/wlanxx/get_channel
+ *      cat /sys/class/net/wlanxx/channel
  *
  * Return: none
  */
 void hdd_sysfs_get_channel_interface_create(struct hdd_adapter *adapter);
 
 /**
- * hdd_sysfs_get_channel_interface_destroy() - API to destroy get_channel
+ * hdd_sysfs_get_channel_interface_destroy() - API to destroy channel
  * @adapter: pointer to adapter
  *
  * Return: none
diff --git a/core/hdd/inc/wlan_hdd_sysfs_get_sta_info.h b/core/hdd/inc/wlan_hdd_sysfs_get_sta_info.h
index 98de7e0d96..567306c3dc 100644
--- a/core/hdd/inc/wlan_hdd_sysfs_get_sta_info.h
+++ b/core/hdd/inc/wlan_hdd_sysfs_get_sta_info.h
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_get_sta_info.h
  *
- * implementation for creating sysfs file get_sta_info
+ * implementation for creating sysfs file sta_info
  */
 
 #ifndef _WLAN_HDD_SYSFS_GET_STA_INFO_H
@@ -25,23 +25,23 @@
 
 #if defined(WLAN_SYSFS) && defined(WLAN_SYSFS_GET_STA_INFO)
 /**
- * hdd_sysfs_get_sta_info_interface_create() - API to create get_sta_info sysfs
+ * hdd_sysfs_get_sta_info_interface_create() - API to create sta_info sysfs
  * interface
  * @adapter: pointer to adapter
  *
  * this file is created for SAP adapter.
- * file path: /sys/class/net/wlanxx/get_sta_info
+ * file path: /sys/class/net/wlanxx/sta_info
  *	where wlanxx is adapter name
  *
  * usage:
- *      cat /sys/class/net/wlanxx/get_sta_info
+ *      cat /sys/class/net/wlanxx/sta_info
  *
  * Return: none
  */
 void hdd_sysfs_get_sta_info_interface_create(struct hdd_adapter *adapter);
 
 /**
- * hdd_sysfs_get_sta_info_interface_destroy() - API to destroy get_sta_info
+ * hdd_sysfs_get_sta_info_interface_destroy() - API to destroy sta_info
  * @adapter: pointer to adapter
  *
  * Return: none
diff --git a/core/hdd/inc/wlan_hdd_sysfs_get_tdls_peers.h b/core/hdd/inc/wlan_hdd_sysfs_get_tdls_peers.h
index 5b8b877271..2aa9fdc7b5 100644
--- a/core/hdd/inc/wlan_hdd_sysfs_get_tdls_peers.h
+++ b/core/hdd/inc/wlan_hdd_sysfs_get_tdls_peers.h
@@ -25,23 +25,23 @@
 
 #if defined(WLAN_SYSFS) && defined(WLAN_GET_TDLS_PEERS)
 /**
- * hdd_sysfs_get_tdls_peers_interface_create() - API to create get_tdls_peers
+ * hdd_sysfs_get_tdls_peers_interface_create() - API to create tdls_peers
  * sysfs interface
  * @adapter: pointer to adapter
  *
  * this file is created per adapter.
- * file path: /sys/class/net/wlanxx/get_tdls_peers
+ * file path: /sys/class/net/wlanxx/tdls_peers
  *	where wlanxx is adapter name
  *
  * usage:
- *      cat /sys/class/net/wlanxx/get_tdls_peers
+ *      cat /sys/class/net/wlanxx/tdls_peers
  *
  * Return: none
  */
 void hdd_sysfs_get_tdls_peers_interface_create(struct hdd_adapter *adapter);
 
 /**
- * hdd_sysfs_get_tdls_peers_interface_destroy() - API to destroy get_tdls_peers
+ * hdd_sysfs_get_tdls_peers_interface_destroy() - API to destroy tdls_peers
  * sysfs interface
  * @adapter: pointer to adapter
  *
diff --git a/core/hdd/src/wlan_hdd_sysfs_dp_trace.c b/core/hdd/src/wlan_hdd_sysfs_dp_trace.c
index dfd1331478..8f423dc9af 100644
--- a/core/hdd/src/wlan_hdd_sysfs_dp_trace.c
+++ b/core/hdd/src/wlan_hdd_sysfs_dp_trace.c
@@ -112,7 +112,7 @@ hdd_sysfs_set_dp_trace_store(struct kobject *kobj,
 }
 
 static struct kobj_attribute set_dp_trace_attribute =
-	__ATTR(set_dp_trace, 0220, NULL,
+	__ATTR(dp_trace, 0220, NULL,
 	       hdd_sysfs_set_dp_trace_store);
 
 static uint32_t dump_dp_trace_count = 0;
diff --git a/core/hdd/src/wlan_hdd_sysfs_get_channel.c b/core/hdd/src/wlan_hdd_sysfs_get_channel.c
index 88d999e236..4f130f8da5 100644
--- a/core/hdd/src/wlan_hdd_sysfs_get_channel.c
+++ b/core/hdd/src/wlan_hdd_sysfs_get_channel.c
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_get_channel.c
  *
- * implementation for creating sysfs file get_channel
+ * implementation for creating sysfs file channel
  */
 
 #include <wlan_hdd_includes.h>
@@ -78,18 +78,18 @@ static ssize_t show_channel_number(struct device *dev,
 	return err_size;
 }
 
-static DEVICE_ATTR(get_channel, 0444, show_channel_number, NULL);
+static DEVICE_ATTR(channel, 0444, show_channel_number, NULL);
 
 void hdd_sysfs_get_channel_interface_create(struct hdd_adapter *adapter)
 {
 	int error;
 
-	error = device_create_file(&adapter->dev->dev, &dev_attr_get_channel);
+	error = device_create_file(&adapter->dev->dev, &dev_attr_channel);
 	if (error)
-		hdd_err("Could not create get_channel sysfs file");
+		hdd_err("Could not create channel sysfs file");
 }
 
 void hdd_sysfs_get_channel_interface_destroy(struct hdd_adapter *adapter)
 {
-	device_remove_file(&adapter->dev->dev, &dev_attr_get_channel);
+	device_remove_file(&adapter->dev->dev, &dev_attr_channel);
 }
diff --git a/core/hdd/src/wlan_hdd_sysfs_get_range_ext.c b/core/hdd/src/wlan_hdd_sysfs_get_range_ext.c
index d6f8e5e493..c62ef70688 100644
--- a/core/hdd/src/wlan_hdd_sysfs_get_range_ext.c
+++ b/core/hdd/src/wlan_hdd_sysfs_get_range_ext.c
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_get_range_ext.c
  *
- * implementation for creating sysfs file get_range_ext
+ * implementation for creating sysfs file range_ext
  */
 
 #include <wlan_hdd_includes.h>
@@ -75,7 +75,7 @@ hdd_sysfs_get_range_ext_show(struct device *dev,
 	return err_size;
 }
 
-static DEVICE_ATTR(get_range_ext, 0440,
+static DEVICE_ATTR(range_ext, 0440,
 		   hdd_sysfs_get_range_ext_show, NULL);
 
 int hdd_sysfs_get_range_ext_create(struct hdd_adapter *adapter)
@@ -83,14 +83,14 @@ int hdd_sysfs_get_range_ext_create(struct hdd_adapter *adapter)
 	int error;
 
 	error = device_create_file(&adapter->dev->dev,
-				   &dev_attr_get_range_ext);
+				   &dev_attr_range_ext);
 	if (error)
-		hdd_err("could not create get_range_ext sysfs file");
+		hdd_err("could not create range_ext sysfs file");
 
 	return error;
 }
 
 void hdd_sysfs_get_range_ext_destroy(struct hdd_adapter *adapter)
 {
-	device_remove_file(&adapter->dev->dev, &dev_attr_get_range_ext);
+	device_remove_file(&adapter->dev->dev, &dev_attr_range_ext);
 }
diff --git a/core/hdd/src/wlan_hdd_sysfs_get_range_ext.h b/core/hdd/src/wlan_hdd_sysfs_get_range_ext.h
index a7b3863cd4..072f492831 100644
--- a/core/hdd/src/wlan_hdd_sysfs_get_range_ext.h
+++ b/core/hdd/src/wlan_hdd_sysfs_get_range_ext.h
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_get_range_ext.h
  *
- * implementation for creating sysfs file get_range_ext
+ * implementation for creating sysfs file range_ext
  */
 
 #ifndef _WLAN_HDD_SYSFS_GET_RANGE_EXT_H
@@ -25,15 +25,15 @@
 
 #if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_GET_RANGE_EXT)
 /**
- * hdd_sysfs_get_range_ext_create() - API to create get_range_ext
+ * hdd_sysfs_get_range_ext_create() - API to create range_ext
  * @adapter: pointer to adapter
  *
  * this file is created per adapter.
- * file path: /sys/class/net/wlanxx/get_range_ext
+ * file path: /sys/class/net/wlanxx/range_ext
  *	where wlanxx is adapter name
  *
  * usage:
- *      cat /sys/class/net/wlanxx/get_range_ext
+ *      cat /sys/class/net/wlanxx/range_ext
  *
  * Return: 0 on success and errno on failure
  */
@@ -41,7 +41,7 @@ int hdd_sysfs_get_range_ext_create(struct hdd_adapter *adapter);
 
 /**
  * hdd_sysfs_get_range_ext_destroy() -
- *   API to destroy get_range_ext
+ *   API to destroy range_ext
  * @adapter: pointer to adapter
  *
  * Return: none
diff --git a/core/hdd/src/wlan_hdd_sysfs_get_sta_info.c b/core/hdd/src/wlan_hdd_sysfs_get_sta_info.c
index 6e67e3f9b3..c16c9744f1 100644
--- a/core/hdd/src/wlan_hdd_sysfs_get_sta_info.c
+++ b/core/hdd/src/wlan_hdd_sysfs_get_sta_info.c
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_get_sta_info.c
  *
- * implementation for creating sysfs file get_sta_info
+ * implementation for creating sysfs file sta_info
  */
 
 #include <wlan_hdd_includes.h>
@@ -92,18 +92,18 @@ static ssize_t show_sta_info(struct device *dev,
 	return err_size;
 }
 
-static DEVICE_ATTR(get_sta_info, 0444, show_sta_info, NULL);
+static DEVICE_ATTR(sta_info, 0444, show_sta_info, NULL);
 
 void hdd_sysfs_get_sta_info_interface_create(struct hdd_adapter *adapter)
 {
 	int error;
 
-	error = device_create_file(&adapter->dev->dev, &dev_attr_get_sta_info);
+	error = device_create_file(&adapter->dev->dev, &dev_attr_sta_info);
 	if (error)
-		hdd_err("Could not create get_sta_info sysfs file");
+		hdd_err("Could not create sta_info sysfs file");
 }
 
 void hdd_sysfs_get_sta_info_interface_destroy(struct hdd_adapter *adapter)
 {
-	device_remove_file(&adapter->dev->dev, &dev_attr_get_sta_info);
+	device_remove_file(&adapter->dev->dev, &dev_attr_sta_info);
 }
diff --git a/core/hdd/src/wlan_hdd_sysfs_get_stats.c b/core/hdd/src/wlan_hdd_sysfs_get_stats.c
index 34c19254fa..58acb4c0a9 100644
--- a/core/hdd/src/wlan_hdd_sysfs_get_stats.c
+++ b/core/hdd/src/wlan_hdd_sysfs_get_stats.c
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_get_stats.c
  *
- * implementation for creating sysfs file get_stats
+ * implementation for creating sysfs file stats
  */
 
 #include <wlan_hdd_includes.h>
@@ -146,7 +146,7 @@ hdd_sysfs_get_stats_show(struct device *dev,
 	return err_size;
 }
 
-static DEVICE_ATTR(get_stats, 0440,
+static DEVICE_ATTR(stats, 0440,
 		   hdd_sysfs_get_stats_show, NULL);
 
 int hdd_sysfs_get_stats_create(struct hdd_adapter *adapter)
@@ -154,14 +154,14 @@ int hdd_sysfs_get_stats_create(struct hdd_adapter *adapter)
 	int error;
 
 	error = device_create_file(&adapter->dev->dev,
-				   &dev_attr_get_stats);
+				   &dev_attr_stats);
 	if (error)
-		hdd_err("could not create get_stats sysfs file");
+		hdd_err("could not create stats sysfs file");
 
 	return error;
 }
 
 void hdd_sysfs_get_stats_destroy(struct hdd_adapter *adapter)
 {
-	device_remove_file(&adapter->dev->dev, &dev_attr_get_stats);
+	device_remove_file(&adapter->dev->dev, &dev_attr_stats);
 }
diff --git a/core/hdd/src/wlan_hdd_sysfs_get_stats.h b/core/hdd/src/wlan_hdd_sysfs_get_stats.h
index 364c0858a9..0e0e3de22a 100644
--- a/core/hdd/src/wlan_hdd_sysfs_get_stats.h
+++ b/core/hdd/src/wlan_hdd_sysfs_get_stats.h
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_get_stats.h
  *
- * implementation for creating sysfs file get_stats
+ * implementation for creating sysfs file stats
  */
 
 #ifndef _WLAN_HDD_SYSFS_GET_STATS_H
@@ -25,15 +25,15 @@
 
 #if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_GET_STATS)
 /**
- * hdd_sysfs_get_stats_create() - API to create get_stats
+ * hdd_sysfs_get_stats_create() - API to create stats sysfs file
  * @adapter: pointer to adapter
  *
  * this file is created per adapter.
- * file path: /sys/class/net/wlanxx/get_stats
+ * file path: /sys/class/net/wlanxx/stats
  *	where wlanxx is adapter name
  *
  * usage:
- *      cat /sys/class/net/wlanxx/get_stats
+ *      cat /sys/class/net/wlanxx/stats
  *
  * Return: 0 on success and errno on failure
  */
@@ -41,7 +41,7 @@ int hdd_sysfs_get_stats_create(struct hdd_adapter *adapter);
 
 /**
  * hdd_sysfs_get_stats_destroy() -
- *   API to destroy get_stats
+ *   API to destroy stats sysfs file
  * @adapter: pointer to adapter
  *
  * Return: none
diff --git a/core/hdd/src/wlan_hdd_sysfs_get_tdls_peers.c b/core/hdd/src/wlan_hdd_sysfs_get_tdls_peers.c
index 914bbb7cfa..f5d4488031 100644
--- a/core/hdd/src/wlan_hdd_sysfs_get_tdls_peers.c
+++ b/core/hdd/src/wlan_hdd_sysfs_get_tdls_peers.c
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_get_tdls_peers.c
  *
- * implementation for creating sysfs file get_tdls_peers
+ * implementation for creating sysfs file tdls_peers
  */
 
 #include <wlan_hdd_includes.h>
@@ -100,19 +100,19 @@ static ssize_t show_tdls_all_peers(struct device *dev,
 	return err_size;
 }
 
-static DEVICE_ATTR(get_tdls_peers, 0444, show_tdls_all_peers, NULL);
+static DEVICE_ATTR(tdls_peers, 0444, show_tdls_all_peers, NULL);
 
 void hdd_sysfs_get_tdls_peers_interface_create(struct hdd_adapter *adapter)
 {
 	int error;
 
 	error = device_create_file(&adapter->dev->dev,
-				   &dev_attr_get_tdls_peers);
+				   &dev_attr_tdls_peers);
 	if (error)
-		hdd_err("could not create get_tdls_peers sysfs file");
+		hdd_err("could not create tdls_peers sysfs file");
 }
 
 void hdd_sysfs_get_tdls_peers_interface_destroy(struct hdd_adapter *adapter)
 {
-	device_remove_file(&adapter->dev->dev, &dev_attr_get_tdls_peers);
+	device_remove_file(&adapter->dev->dev, &dev_attr_tdls_peers);
 }
diff --git a/core/hdd/src/wlan_hdd_sysfs_get_temp.c b/core/hdd/src/wlan_hdd_sysfs_get_temp.c
index 831a66e892..23b46bb5c3 100644
--- a/core/hdd/src/wlan_hdd_sysfs_get_temp.c
+++ b/core/hdd/src/wlan_hdd_sysfs_get_temp.c
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_get_temp.c
  *
- * implementation for creating sysfs file get_temp
+ * implementation for creating sysfs file temp
  */
 
 #include <wlan_hdd_includes.h>
@@ -78,7 +78,7 @@ hdd_sysfs_get_temp_show(struct device *dev,
 	return err_size;
 }
 
-static DEVICE_ATTR(get_temp, 0440,
+static DEVICE_ATTR(temperature, 0440,
 		   hdd_sysfs_get_temp_show, NULL);
 
 int hdd_sysfs_get_temp_create(struct hdd_adapter *adapter)
@@ -86,14 +86,14 @@ int hdd_sysfs_get_temp_create(struct hdd_adapter *adapter)
 	int error;
 
 	error = device_create_file(&adapter->dev->dev,
-				   &dev_attr_get_temp);
+				   &dev_attr_temperature);
 	if (error)
-		hdd_err("could not create get_temp sysfs file");
+		hdd_err("could not create temp sysfs file");
 
 	return error;
 }
 
 void hdd_sysfs_get_temp_destroy(struct hdd_adapter *adapter)
 {
-	device_remove_file(&adapter->dev->dev, &dev_attr_get_temp);
+	device_remove_file(&adapter->dev->dev, &dev_attr_temperature);
 }
diff --git a/core/hdd/src/wlan_hdd_sysfs_get_temp.h b/core/hdd/src/wlan_hdd_sysfs_get_temp.h
index a582a6dde6..1658086be6 100644
--- a/core/hdd/src/wlan_hdd_sysfs_get_temp.h
+++ b/core/hdd/src/wlan_hdd_sysfs_get_temp.h
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_get_temp.h
  *
- * implementation for creating sysfs file get_temp
+ * implementation for creating sysfs file temperature
  */
 
 #ifndef _WLAN_HDD_SYSFS_GET_TEMP_H
@@ -25,15 +25,15 @@
 
 #if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_GET_TEMP)
 /**
- * hdd_sysfs_get_temp_create() - API to create get_temp
+ * hdd_sysfs_get_temp_create() - API to create temperature sysfs file
  * @adapter: pointer to adapter
  *
  * this file is created per adapter.
- * file path: /sys/class/net/wlanxx/get_temp
+ * file path: /sys/class/net/wlanxx/temperature
  *	where wlanxx is adapter name
  *
  * usage:
- *      cat /sys/class/net/wlanxx/get_temp
+ *      cat /sys/class/net/wlanxx/temperature
  *
  * Return: 0 on success and errno on failure
  */
@@ -41,7 +41,7 @@ int hdd_sysfs_get_temp_create(struct hdd_adapter *adapter);
 
 /**
  * hdd_sysfs_get_temp_destroy() -
- *   API to destroy get_temp
+ *   API to destroy temperature sysfs file
  * @adapter: pointer to adapter
  *
  * Return: none
diff --git a/core/hdd/src/wlan_hdd_sysfs_get_tx_stbc.c b/core/hdd/src/wlan_hdd_sysfs_get_tx_stbc.c
index c7bdcfb676..1b1ea00e19 100644
--- a/core/hdd/src/wlan_hdd_sysfs_get_tx_stbc.c
+++ b/core/hdd/src/wlan_hdd_sysfs_get_tx_stbc.c
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_get_tx_stbc.c
  *
- * implementation for creating sysfs file get_tx_stbc
+ * implementation for creating sysfs file tx_stbc
  */
 
 #include <wlan_hdd_includes.h>
@@ -94,7 +94,7 @@ hdd_sysfs_get_tx_stbc_show(struct device *dev,
 	return err_size;
 }
 
-static DEVICE_ATTR(get_tx_stbc, 0440,
+static DEVICE_ATTR(tx_stbc, 0440,
 		   hdd_sysfs_get_tx_stbc_show, NULL);
 
 int hdd_sysfs_get_tx_stbc_create(struct hdd_adapter *adapter)
@@ -102,14 +102,14 @@ int hdd_sysfs_get_tx_stbc_create(struct hdd_adapter *adapter)
 	int error;
 
 	error = device_create_file(&adapter->dev->dev,
-				   &dev_attr_get_tx_stbc);
+				   &dev_attr_tx_stbc);
 	if (error)
-		hdd_err("could not create get_tx_stbc sysfs file");
+		hdd_err("could not create tx_stbc sysfs file");
 
 	return error;
 }
 
 void hdd_sysfs_get_tx_stbc_destroy(struct hdd_adapter *adapter)
 {
-	device_remove_file(&adapter->dev->dev, &dev_attr_get_tx_stbc);
+	device_remove_file(&adapter->dev->dev, &dev_attr_tx_stbc);
 }
diff --git a/core/hdd/src/wlan_hdd_sysfs_get_tx_stbc.h b/core/hdd/src/wlan_hdd_sysfs_get_tx_stbc.h
index 3733731f40..6ed2ca8778 100644
--- a/core/hdd/src/wlan_hdd_sysfs_get_tx_stbc.h
+++ b/core/hdd/src/wlan_hdd_sysfs_get_tx_stbc.h
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_get_tx_stbc.h
  *
- * implementation for creating sysfs file get_tx_stbc
+ * implementation for creating sysfs file tx_stbc
  */
 
 #ifndef _WLAN_HDD_SYSFS_GET_TX_STBC_H
@@ -25,15 +25,15 @@
 
 #if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_GET_TX_STBC)
 /**
- * hdd_sysfs_get_tx_stbc_create() - API to create get_tx_stbc
+ * hdd_sysfs_get_tx_stbc_create() - API to create tx_stbc sysfs file
  * @adapter: pointer to adapter
  *
  * this file is created per adapter.
- * file path: /sys/class/net/wlanxx/get_tx_stbc
+ * file path: /sys/class/net/wlanxx/tx_stbc
  *	where wlanxx is adapter name
  *
  * usage:
- *      cat /sys/class/net/wlanxx/get_tx_stbc
+ *      cat /sys/class/net/wlanxx/tx_stbc
  *
  * Return: 0 on success and errno on failure
  */
@@ -41,7 +41,7 @@ int hdd_sysfs_get_tx_stbc_create(struct hdd_adapter *adapter);
 
 /**
  * hdd_sysfs_get_tx_stbc_destroy() -
- *   API to destroy get_tx_stbc
+ *   API to destroy tx_stbc sysfs file
  * @adapter: pointer to adapter
  *
  * Return: none
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_fw_mode_cfg.c b/core/hdd/src/wlan_hdd_sysfs_set_fw_mode_cfg.c
index b2b7508d3c..b952d36525 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_fw_mode_cfg.c
+++ b/core/hdd/src/wlan_hdd_sysfs_set_fw_mode_cfg.c
@@ -19,7 +19,7 @@
 /**
  * DOC: wlan_hdd_sysfs_set_fw_mode_cfg.c
  *
- * implementation for creating sysfs file set_fw_mode_cfg
+ * implementation for creating sysfs file fw_mode_config
  */
 
 #include <wlan_hdd_includes.h>
@@ -118,7 +118,7 @@ wlan_hdd_store_set_fw_mode_cfg_sysfs(struct kobject *kobj,
 }
 
 static struct kobj_attribute set_fw_mode_cfg_attribute =
-	__ATTR(set_fw_mode_cfg, 0220, NULL,
+	__ATTR(fw_mode_config, 0220, NULL,
 	       wlan_hdd_store_set_fw_mode_cfg_sysfs);
 
 int hdd_sysfs_set_fw_mode_cfg_create(struct kobject *driver_kobject)
@@ -133,7 +133,7 @@ int hdd_sysfs_set_fw_mode_cfg_create(struct kobject *driver_kobject)
 	error = sysfs_create_file(driver_kobject,
 				  &set_fw_mode_cfg_attribute.attr);
 	if (error)
-		hdd_err("could not create set_fw_mode_cfg sysfs file");
+		hdd_err("could not create fw_mode_config sysfs file");
 
 	return error;
 }
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_fw_mode_cfg.h b/core/hdd/src/wlan_hdd_sysfs_set_fw_mode_cfg.h
index d960a04e20..e5a15036da 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_fw_mode_cfg.h
+++ b/core/hdd/src/wlan_hdd_sysfs_set_fw_mode_cfg.h
@@ -19,7 +19,7 @@
 /**
  * DOC: wlan_hdd_sysfs_set_fw_mode_cfg.h
  *
- * implementation for creating sysfs file set_fw_mode_cfg
+ * implementation for creating sysfs file fw_mode_config
  */
 
 #ifndef _WLAN_HDD_SYSFS_SET_FW_MODE_CFG_H
@@ -27,13 +27,13 @@
 
 #if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SET_FW_MODE_CFG)
 /**
- * hdd_sysfs_set_fw_mode_cfg_create() - API to create set_fw_mode_cfg
+ * hdd_sysfs_set_fw_mode_cfg_create() - API to create fw_mode_config sysfs file
  * @driver_kobject: sysfs driver kobject
  *
- * file path: /sys/kernel/wifi/set_fw_mode_cfg
+ * file path: /sys/kernel/wifi/fw_mode_config
  *
  * usage:
- *      echo [arg_0] [arg_1] > set_fw_mode_cfg
+ *      echo [arg_0] [arg_1] > fw_mode_config
  *
  * Return: 0 on success and errno on failure
  */
@@ -41,7 +41,7 @@ int hdd_sysfs_set_fw_mode_cfg_create(struct kobject *driver_kobject);
 
 /**
  * hdd_sysfs_set_fw_mode_cfg_destroy() -
- *   API to destroy set_fw_mode_cfg
+ *   API to destroy fw_mode_config sysfs file
  *
  * Return: none
  */
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_mon_chan.c b/core/hdd/src/wlan_hdd_sysfs_set_mon_chan.c
index fbf33b180b..ccadd0e88d 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_mon_chan.c
+++ b/core/hdd/src/wlan_hdd_sysfs_set_mon_chan.c
@@ -19,7 +19,7 @@
 /**
  * DOC: wlan_hdd_sysfs_set_mon_chan.c
  *
- * implementation for creating sysfs file set_mon_chan
+ * implementation for creating sysfs file monitor_mode_channel
  */
 
 #include <wlan_hdd_includes.h>
@@ -108,21 +108,21 @@ hdd_sysfs_set_mon_chan_store(struct device *dev,
 	return errno_size;
 }
 
-static DEVICE_ATTR(set_mon_chan, 0220,
+static DEVICE_ATTR(monitor_mode_channel, 0220,
 		   NULL, hdd_sysfs_set_mon_chan_store);
 
 int hdd_sysfs_set_mon_chan_create(struct hdd_adapter *adapter)
 {
 	int error;
 
-	error = device_create_file(&adapter->dev->dev, &dev_attr_set_mon_chan);
+	error = device_create_file(&adapter->dev->dev, &dev_attr_monitor_mode_channel);
 	if (error)
-		hdd_err("could not create set_mon_chan sysfs file");
+		hdd_err("could not create monitor_mode_channel sysfs file");
 
 	return error;
 }
 
 void hdd_sysfs_set_mon_chan_destroy(struct hdd_adapter *adapter)
 {
-	device_remove_file(&adapter->dev->dev, &dev_attr_set_mon_chan);
+	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_set_mon_chan.h
index 3a3dca60f4..c3208edd66 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_mon_chan.h
+++ b/core/hdd/src/wlan_hdd_sysfs_set_mon_chan.h
@@ -19,7 +19,7 @@
 /**
  * DOC: wlan_hdd_sysfs_set_mon_chan.h
  *
- * implementation for creating sysfs file set_mon_chan
+ * implementation for creating sysfs file monitor_mode_channel
  */
 
 #ifndef _WLAN_HDD_SYSFS_SET_MON_CHAN_H
@@ -27,14 +27,14 @@
 
 #if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SET_MON_CHAN)
 /**
- * wlan_hdd_sysfs_set_mon_chan_create() - API to create set_mon_chan
+ * wlan_hdd_sysfs_set_mon_chan_create() - API to create monitor_mode_channel
  * @adapter: hdd adapter
  *
  * this file is created per adapter.
- * file path: /sys/class/net/wlanxx/set_mon_chan
+ * file path: /sys/class/net/wlanxx/monitor_mode_channel
  *                (wlanxx is adapter name)
  * usage:
- *      echo [arg_0] [arg_1] > set_mon_chan
+ *      echo [arg_0] [arg_1] > monitor_mode_channel
  *
  * Return: 0 on success and errno on failure
  */
@@ -42,7 +42,7 @@ int hdd_sysfs_set_mon_chan_create(struct hdd_adapter *adapter);
 
 /**
  * hdd_sysfs_set_mon_chan_destroy() -
- *   API to destroy set_mon_chan
+ *   API to destroy monitor_mode_channel sysfs file
  * @adapter: pointer to adapter
  *
  * Return: none
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_radar.c b/core/hdd/src/wlan_hdd_sysfs_set_radar.c
index 1f6e96db6a..7e5d58c4b3 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_radar.c
+++ b/core/hdd/src/wlan_hdd_sysfs_set_radar.c
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_set_radar.c
  *
- * implementation for creating sysfs file set_radar
+ * implementation for creating sysfs file radar
  */
 
 #include <wlan_hdd_includes.h>
@@ -110,21 +110,21 @@ hdd_sysfs_set_radar_store(struct device *dev,
 	return errno_size;
 }
 
-static DEVICE_ATTR(set_radar, 0220,
+static DEVICE_ATTR(radar, 0220,
 		   NULL, hdd_sysfs_set_radar_store);
 
 int hdd_sysfs_set_radar_create(struct hdd_adapter *adapter)
 {
 	int error;
 
-	error = device_create_file(&adapter->dev->dev, &dev_attr_set_radar);
+	error = device_create_file(&adapter->dev->dev, &dev_attr_radar);
 	if (error)
-		hdd_err("could not create set_radar sysfs file");
+		hdd_err("could not create radar sysfs file");
 
 	return error;
 }
 
 void hdd_sysfs_set_radar_destroy(struct hdd_adapter *adapter)
 {
-	device_remove_file(&adapter->dev->dev, &dev_attr_set_radar);
+	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_set_radar.h
index a3bf566215..3fe89b72d4 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_radar.h
+++ b/core/hdd/src/wlan_hdd_sysfs_set_radar.h
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_set_radar.h
  *
- * implementation for creating sysfs file set_radar
+ * implementation for creating sysfs file radar
  */
 
 #ifndef _WLAN_HDD_SYSFS_SET_RADAR_H
@@ -25,15 +25,15 @@
 
 #if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SET_RADAR)
 /**
- * wlan_hdd_sysfs_set_radar_create() - API to create set_radar
+ * wlan_hdd_sysfs_set_radar_create() - API to create radar sysfs file
  * (for sap mode only)
  * @adapter: hdd adapter
  *
  * this file is created per adapter.
- * file path: /sys/class/net/wlanxx/set_radar
+ * file path: /sys/class/net/wlanxx/radar
  *                (wlanxx is adapter name)
  * usage:
- *      echo [arg_0] > set_radar
+ *      echo [arg_0] > radar
  *
  * Return: 0 on success and errno on failure
  */
@@ -41,7 +41,7 @@ int hdd_sysfs_set_radar_create(struct hdd_adapter *adapter);
 
 /**
  * hdd_sysfs_set_radar_destroy() -
- *   API to destroy set_radar
+ *   API to destroy radar sysfs file
  * @adapter: pointer to adapter
  *
  * Return: none
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.c b/core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.c
index 5647dea773..be6e99e854 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.c
+++ b/core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.c
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_set_scan_cfg.c
  *
- * implementation for creating sysfs file set_scan_cfg
+ * implementation for creating sysfs file scan_config
  */
 
 #include <wlan_hdd_includes.h>
@@ -120,7 +120,7 @@ hdd_sysfs_set_scan_cfg_store(struct kobject *kobj,
 }
 
 static struct kobj_attribute set_scan_cfg_attribute =
-	__ATTR(set_scan_cfg, 0220, NULL,
+	__ATTR(scan_config, 0220, NULL,
 	       hdd_sysfs_set_scan_cfg_store);
 
 int hdd_sysfs_set_scan_cfg_create(struct kobject *driver_kobject)
@@ -135,7 +135,7 @@ int hdd_sysfs_set_scan_cfg_create(struct kobject *driver_kobject)
 	error = sysfs_create_file(driver_kobject,
 				  &set_scan_cfg_attribute.attr);
 	if (error)
-		hdd_err("could not create set_scan_cfg sysfs file");
+		hdd_err("could not create scan_config sysfs file");
 
 	return error;
 }
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.h b/core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.h
index 638ed94ae6..e609114256 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.h
+++ b/core/hdd/src/wlan_hdd_sysfs_set_scan_cfg.h
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_set_scan_cfg.h
  *
- * implementation for creating sysfs file set_scan_cfg
+ * implementation for creating sysfs file scan_config
  */
 
 #ifndef _WLAN_HDD_SYSFS_SET_SCAN_CFG_H
@@ -25,13 +25,13 @@
 
 #if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SET_SCAN_CFG)
 /**
- * hdd_sysfs_set_scan_cfg_create() - API to create set_scan_cfg
+ * hdd_sysfs_set_scan_cfg_create() - API to create scan_config sysfs file
  * @driver_kobject: sysfs driver kobject
  *
- * file path: /sys/kernel/wifi/set_scan_cfg
+ * file path: /sys/kernel/wifi/scan_config
  *
  * usage:
- *      echo [arg_0] [arg_1] [arg_2]> set_scan_cfg
+ *      echo [arg_0] [arg_1] [arg_2]> scan_config
  *
  * Return: 0 on success and errno on failure
  */
@@ -39,7 +39,7 @@ int hdd_sysfs_set_scan_cfg_create(struct kobject *driver_kobject);
 
 /**
  * hdd_sysfs_set_scan_cfg_destroy() -
- *   API to destroy set_scan_cfg
+ *   API to destroy scan_config sysfs file
  *
  * Return: none
  */
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_wlan_dbg.c b/core/hdd/src/wlan_hdd_sysfs_set_wlan_dbg.c
index cdd9b531f7..aee74af4d9 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_wlan_dbg.c
+++ b/core/hdd/src/wlan_hdd_sysfs_set_wlan_dbg.c
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_set_wlan_dbg.c
  *
- * implementation for creating sysfs file set_wlan_dbg
+ * implementation for creating sysfs file wlan_dbg
  */
 
 #include <wlan_hdd_includes.h>
@@ -103,7 +103,7 @@ hdd_sysfs_set_wlan_dbg_store(struct kobject *kobj,
 }
 
 static struct kobj_attribute set_wlan_dbg_attribute =
-	__ATTR(set_wlan_dbg, 0220, NULL,
+	__ATTR(wlan_dbg, 0220, NULL,
 	       hdd_sysfs_set_wlan_dbg_store);
 
 int hdd_sysfs_set_wlan_dbg_create(struct kobject *driver_kobject)
@@ -118,7 +118,7 @@ int hdd_sysfs_set_wlan_dbg_create(struct kobject *driver_kobject)
 	error = sysfs_create_file(driver_kobject,
 				  &set_wlan_dbg_attribute.attr);
 	if (error)
-		hdd_err("could not create set_wlan_dbg sysfs file");
+		hdd_err("could not create wlan_dbg sysfs file");
 
 	return error;
 }
diff --git a/core/hdd/src/wlan_hdd_sysfs_set_wlan_dbg.h b/core/hdd/src/wlan_hdd_sysfs_set_wlan_dbg.h
index 1f6f847795..1e7cc78e9b 100644
--- a/core/hdd/src/wlan_hdd_sysfs_set_wlan_dbg.h
+++ b/core/hdd/src/wlan_hdd_sysfs_set_wlan_dbg.h
@@ -17,7 +17,7 @@
 /**
  * DOC: wlan_hdd_sysfs_set_wlan_dbg.h
  *
- * implementation for creating sysfs file set_wlan_dbg
+ * implementation for creating sysfs file wlan_dbg
  */
 
 #ifndef _WLAN_HDD_SYSFS_SET_WLAN_DBG_H
@@ -25,20 +25,20 @@
 
 #if defined(WLAN_SYSFS) && defined(CONFIG_WLAN_SET_WLAN_DBG)
 /**
- * hdd_sysfs_set_wlan_dbg_create() - API to create set_wlan_dbg
+ * hdd_sysfs_set_wlan_dbg_create() - API to create wlan_dbg sysfs file
  * @driver_kobject: sysfs driver kobject
  *
- * file path: /sys/kernel/wifi/set_wlan_dbg
+ * file path: /sys/kernel/wifi/wlan_dbg
  *
  * usage:
- *      echo [arg_0] [arg_1] [arg_2] > set_wlan_dbg
+ *      echo [arg_0] [arg_1] [arg_2] > wlan_dbg
  *
  * Return: 0 on success and errno on failure
  */
 int hdd_sysfs_set_wlan_dbg_create(struct kobject *driver_kobject);
 
 /**
- * hdd_sysfs_set_wlan_dbg_destroy() - API to destroy set_wlan_dbg
+ * hdd_sysfs_set_wlan_dbg_destroy() - API to destroy wlan_dbg sysfs file
  *
  * Return: none
  */