diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index bf96fbb7bece..fec9c9da846c 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -1130,8 +1130,8 @@ struct hdd_adapter {
 	struct wireless_dev wdev;
 
 	/** ops checks if Opportunistic Power Save is Enable or Not
-	 * ctw stores ctWindow value once we receive Opps command from
-	 * wpa_supplicant then using ctWindow value we need to Enable
+	 * ctw stores CT Window value once we receive Opps command from
+	 * wpa_supplicant then using CT Window value we need to Enable
 	 * Opportunistic Power Save
 	 */
 	uint8_t ops;
diff --git a/core/hdd/inc/wlan_hdd_p2p.h b/core/hdd/inc/wlan_hdd_p2p.h
index 8344346d35c7..f53922526c17 100644
--- a/core/hdd/inc/wlan_hdd_p2p.h
+++ b/core/hdd/inc/wlan_hdd_p2p.h
@@ -35,12 +35,12 @@
 
 struct p2p_app_set_ps {
 	uint8_t opp_ps;
-	uint32_t ctWindow;
+	uint32_t ct_window;
 	uint8_t count;
 	uint32_t duration;
 	uint32_t interval;
 	uint32_t single_noa_duration;
-	uint8_t psSelection;
+	uint8_t ps_selection;
 };
 
 int wlan_hdd_cfg80211_remain_on_channel(struct wiphy *wiphy,
diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c
index e7bda7b78912..f3d7fa1a0c8a 100644
--- a/core/hdd/src/wlan_hdd_p2p.c
+++ b/core/hdd/src/wlan_hdd_p2p.c
@@ -432,9 +432,9 @@ int hdd_set_p2p_noa(struct net_device *dev, uint8_t *command)
 	noa.count = count;
 	noa.vdev_id = adapter->vdev_id;
 
-	hdd_debug("P2P_PS_ATTR:oppPS %d ctWindow %d duration %d "
+	hdd_debug("P2P_PS_ATTR:opp ps %d ct window %d duration %d "
 		  "interval %d count %d single noa duration %d "
-		  "PsSelection %x", noa.opp_ps,
+		  "ps selection %x", noa.opp_ps,
 		  noa.ct_window, noa.duration, noa.interval,
 		  noa.count, noa.single_noa_duration, noa.ps_selection);
 
@@ -507,10 +507,10 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command)
 	 * Opportunistic Power Save (1)
 	 */
 
-	/* From wpa_cli user need to use separate command to set ctWindow and
-	 * Opps when user want to set ctWindow during that time other parameters
-	 * values are coming from wpa_supplicant as -1.
-	 * Example : User want to set ctWindow with 30 then wpa_cli command :
+	/* From wpa_cli user need to use separate command to set ct_window
+	 * and Opps when user want to set ct_window during that time other
+	 * parameters values are coming from wpa_supplicant as -1.
+	 * Example : User want to set ct_window with 30 then wpa_cli command :
 	 * P2P_SET ctwindow 30
 	 * Command Received at hdd_hostapd_ioctl is as below:
 	 * P2P_SET_PS -1 -1 30 (legacy_ps = -1, opp_ps = -1, ctwindow = 30)
@@ -543,7 +543,7 @@ int hdd_set_p2p_opps(struct net_device *dev, uint8_t *command)
 		noa.ps_selection = P2P_POWER_SAVE_TYPE_OPPORTUNISTIC;
 		noa.vdev_id = adapter->vdev_id;
 
-		hdd_debug("P2P_PS_ATTR: oppPS %d ctWindow %d duration %d interval %d count %d single noa duration %d PsSelection %x",
+		hdd_debug("P2P_PS_ATTR: opp ps %d ct window %d duration %d interval %d count %d single noa duration %d ps selection %x",
 			noa.opp_ps, noa.ct_window,
 			noa.duration, noa.interval, noa.count,
 			noa.single_noa_duration,
@@ -562,12 +562,12 @@ int hdd_set_p2p_ps(struct net_device *dev, void *msgData)
 	struct p2p_app_set_ps *pappnoa = (struct p2p_app_set_ps *) msgData;
 
 	noa.opp_ps = pappnoa->opp_ps;
-	noa.ct_window = pappnoa->ctWindow;
+	noa.ct_window = pappnoa->ct_window;
 	noa.duration = pappnoa->duration;
 	noa.interval = pappnoa->interval;
 	noa.count = pappnoa->count;
 	noa.single_noa_duration = pappnoa->single_noa_duration;
-	noa.ps_selection = pappnoa->psSelection;
+	noa.ps_selection = pappnoa->ps_selection;
 	noa.vdev_id = adapter->vdev_id;
 
 	return wlan_hdd_set_power_save(adapter, &noa);
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index d61fdcb09b18..0c9820622bcd 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -7895,14 +7895,14 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
 		}
 
 		p2p_noa.opp_ps = apps_args[0];
-		p2p_noa.ctWindow = apps_args[1];
+		p2p_noa.ct_window = apps_args[1];
 		p2p_noa.duration = apps_args[2];
 		p2p_noa.interval = apps_args[3];
 		p2p_noa.count = apps_args[4];
 		p2p_noa.single_noa_duration = apps_args[5];
-		p2p_noa.psSelection = apps_args[6];
+		p2p_noa.ps_selection = apps_args[6];
 
-		hdd_debug("P2P_NOA_ATTR:oppPS %d ctWindow %d duration %d interval %d count %d single noa duration %d PsSelection %x",
+		hdd_debug("P2P_NOA_ATTR:opp ps %d ct window %d duration %d interval %d count %d single noa duration %d ps selection %x",
 			   apps_args[0], apps_args[1], apps_args[2],
 			   apps_args[3], apps_args[4],
 			   apps_args[5], apps_args[6]);