diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h
index 1ff8fe739727..009d3c6c9446 100644
--- a/core/hdd/inc/wlan_hdd_assoc.h
+++ b/core/hdd/inc/wlan_hdd_assoc.h
@@ -210,7 +210,7 @@ typedef struct connection_info_s {
 
 /* Forward declarations */
 typedef struct hdd_adapter hdd_adapter_t;
-typedef struct hdd_context_s hdd_context_t;
+typedef struct hdd_context hdd_context_t;
 typedef struct hdd_station_ctx hdd_station_ctx_t;
 typedef struct hdd_ap_ctx_s hdd_ap_ctx_t;
 
diff --git a/core/hdd/inc/wlan_hdd_he.h b/core/hdd/inc/wlan_hdd_he.h
index c9fd1756f148..f945a3311458 100644
--- a/core/hdd/inc/wlan_hdd_he.h
+++ b/core/hdd/inc/wlan_hdd_he.h
@@ -26,7 +26,7 @@
 #if !defined(WLAN_HDD_HE_H)
 #define WLAN_HDD_HE_H
 
-struct hdd_context_s;
+struct hdd_context;
 struct wma_tgt_cfg;
 struct beacon_data_s;
 struct sap_Config;
@@ -77,7 +77,7 @@ enum qca_wlan_vendor_attr_get_he_capabilities {
  *
  * Return: None
  */
-void hdd_update_tgt_he_cap(struct hdd_context_s *hdd_ctx,
+void hdd_update_tgt_he_cap(struct hdd_context *hdd_ctx,
 			   struct wma_tgt_cfg *cfg);
 
 /**
@@ -144,7 +144,7 @@ int wlan_hdd_cfg80211_get_he_cap(struct wiphy *wiphy,
 },
 
 #else
-static inline void hdd_update_tgt_he_cap(struct hdd_context_s *hdd_ctx,
+static inline void hdd_update_tgt_he_cap(struct hdd_context *hdd_ctx,
 					 struct wma_tgt_cfg *cfg)
 {
 }
diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index 5f55d85dbe7c..63cf80bb57e7 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -1378,7 +1378,7 @@ enum hdd_sta_smps_param {
 };
 
 /** Adapter structure definition */
-struct hdd_context_s {
+struct hdd_context {
 	/** Global CDS context  */
 	v_CONTEXT_t pcds_context;
 
diff --git a/core/hdd/inc/wlan_hdd_nan.h b/core/hdd/inc/wlan_hdd_nan.h
index a246269257b1..e1e921cacfc5 100644
--- a/core/hdd/inc/wlan_hdd_nan.h
+++ b/core/hdd/inc/wlan_hdd_nan.h
@@ -34,7 +34,7 @@
  * WLAN Host Device Driver NAN API specification
  */
 
-struct hdd_context_s;
+struct hdd_context;
 
 #ifdef WLAN_FEATURE_NAN
 struct wiphy;
diff --git a/core/hdd/inc/wlan_hdd_napi.h b/core/hdd/inc/wlan_hdd_napi.h
index 67f4b068f55b..6640de0cb8f9 100644
--- a/core/hdd/inc/wlan_hdd_napi.h
+++ b/core/hdd/inc/wlan_hdd_napi.h
@@ -41,7 +41,7 @@
 /* Linux headers */
 #include <linux/netdevice.h> /* net_device */
 
-struct hdd_context_s;
+struct hdd_context;
 
 #define HDD_NAPI_ANY (-1)
 
@@ -58,12 +58,12 @@ int hdd_napi_poll(struct napi_struct *napi, int budget);
 struct qca_napi_data *hdd_napi_get_all(void);
 
 #ifdef HELIUMPLUS
-int hdd_napi_apply_throughput_policy(struct hdd_context_s *hddctx,
+int hdd_napi_apply_throughput_policy(struct hdd_context *hddctx,
 				     uint64_t              tx_packets,
 				     uint64_t              rx_packets);
 int hdd_napi_serialize(int is_on);
 #else /* FEATURE_NAPI and NOT HELIUM */
-static inline int hdd_napi_apply_throughput_policy(struct hdd_context_s *hddctx,
+static inline int hdd_napi_apply_throughput_policy(struct hdd_context *hddctx,
 						   uint64_t tx_packets,
 						   uint64_t rx_packets)
 {
diff --git a/core/hdd/inc/wlan_hdd_oemdata.h b/core/hdd/inc/wlan_hdd_oemdata.h
index a8a424b8b921..12a1e6f58cbf 100644
--- a/core/hdd/inc/wlan_hdd_oemdata.h
+++ b/core/hdd/inc/wlan_hdd_oemdata.h
@@ -184,14 +184,14 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac,
 int iw_get_oem_data_cap(struct net_device *dev, struct iw_request_info *info,
 			union iwreq_data *wrqu, char *extra);
 
-int oem_activate_service(struct hdd_context_s *hdd_ctx);
+int oem_activate_service(struct hdd_context *hdd_ctx);
 
 void hdd_send_oem_data_rsp_msg(struct oem_data_rsp *oem_rsp);
 void hdd_update_channel_bw_info(hdd_context_t *hdd_ctx,
 				uint16_t chan,
 				void *hdd_chan_info);
 #else
-static inline int oem_activate_service(struct hdd_context_s *hdd_ctx)
+static inline int oem_activate_service(struct hdd_context *hdd_ctx)
 {
 	return 0;
 }
diff --git a/core/hdd/inc/wlan_hdd_tsf.h b/core/hdd/inc/wlan_hdd_tsf.h
index 84368e5303f6..2b69ca80d6b9 100644
--- a/core/hdd/inc/wlan_hdd_tsf.h
+++ b/core/hdd/inc/wlan_hdd_tsf.h
@@ -77,7 +77,7 @@ enum hdd_tsf_capture_state {
  *
  * Return: nothing
  */
-void wlan_hdd_tsf_init(struct hdd_context_s *hdd_ctx);
+void wlan_hdd_tsf_init(struct hdd_context *hdd_ctx);
 
 /**
  * wlan_hdd_tsf_deinit() - reset callbacks for capturing tsf, deinit tsf_plus
@@ -132,7 +132,7 @@ int wlan_hdd_cfg80211_handle_tsf_cmd(struct wiphy *wiphy,
 
 int hdd_get_tsf_cb(void *pcb_cxt, struct stsf *ptsf);
 #else
-static inline void wlan_hdd_tsf_init(struct hdd_context_s *hdd_ctx)
+static inline void wlan_hdd_tsf_init(struct hdd_context *hdd_ctx)
 {
 }
 
diff --git a/core/hdd/inc/wlan_hdd_wext.h b/core/hdd/inc/wlan_hdd_wext.h
index 8cbe0f4cfd00..1fab6545951a 100644
--- a/core/hdd/inc/wlan_hdd_wext.h
+++ b/core/hdd/inc/wlan_hdd_wext.h
@@ -462,7 +462,7 @@ struct iw_request_info;
  * status, this function will log a message if the ioctls are disabled
  * or deprecated.
  */
-int hdd_check_standard_wext_control(struct hdd_context_s *hdd_ctx,
+int hdd_check_standard_wext_control(struct hdd_context *hdd_ctx,
 				    struct iw_request_info *info);
 
 /**
@@ -480,7 +480,7 @@ int hdd_check_standard_wext_control(struct hdd_context_s *hdd_ctx,
  * status, this function will log a message if the ioctls are disabled
  * or deprecated.
  */
-int hdd_check_private_wext_control(struct hdd_context_s *hdd_ctx,
+int hdd_check_private_wext_control(struct hdd_context *hdd_ctx,
 				   struct iw_request_info *info);
 
 #endif /* __WEXT_IW_H__ */
diff --git a/core/hdd/src/wlan_hdd_green_ap.c b/core/hdd/src/wlan_hdd_green_ap.c
index 9eb90e6b3b1c..62b1d8e7d099 100644
--- a/core/hdd/src/wlan_hdd_green_ap.c
+++ b/core/hdd/src/wlan_hdd_green_ap.c
@@ -101,7 +101,7 @@ struct hdd_green_ap_ctx {
  *
  * Return: none
  */
-static void hdd_green_ap_update(struct hdd_context_s *hdd_ctx,
+static void hdd_green_ap_update(struct hdd_context *hdd_ctx,
 				enum hdd_green_ap_ps_state state,
 				enum hdd_green_ap_event event)
 {
@@ -138,7 +138,7 @@ static int hdd_green_ap_enable(hdd_adapter_t *adapter, uint8_t enable)
  *
  * Return: none
  */
-static void hdd_green_ap_mc(struct hdd_context_s *hdd_ctx,
+static void hdd_green_ap_mc(struct hdd_context *hdd_ctx,
 			    enum hdd_green_ap_event event)
 {
 	struct hdd_green_ap_ctx *green_ap;
@@ -282,7 +282,7 @@ done:
  */
 static void hdd_green_ap_timer_fn(void *ctx)
 {
-	struct hdd_context_s *hdd_ctx = ctx;
+	struct hdd_context *hdd_ctx = ctx;
 	struct hdd_green_ap_ctx *green_ap;
 
 	if (wlan_hdd_validate_context(hdd_ctx))
@@ -299,7 +299,7 @@ static void hdd_green_ap_timer_fn(void *ctx)
  *
  * Return: QDF_STATUS_SUCCESS on success, otherwise QDF_STATUS_E_** error
  */
-static QDF_STATUS hdd_green_ap_attach(struct hdd_context_s *hdd_ctx)
+static QDF_STATUS hdd_green_ap_attach(struct hdd_context *hdd_ctx)
 {
 	struct hdd_green_ap_ctx *green_ap;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -336,7 +336,7 @@ error:
  *
  * Return: QDF_STATUS_SUCCESS on success, otherwise QDF_STATUS_E_** error
  */
-static QDF_STATUS hdd_green_ap_deattach(struct hdd_context_s *hdd_ctx)
+static QDF_STATUS hdd_green_ap_deattach(struct hdd_context *hdd_ctx)
 {
 	struct hdd_green_ap_ctx *green_ap = hdd_ctx->green_ap_ctx;
 	QDF_STATUS status = QDF_STATUS_SUCCESS;
@@ -373,7 +373,7 @@ done:
  * hdd_green_ap_init() - Initialize Green AP feature
  * (public function documented in wlan_hdd_green_ap.h)
  */
-void hdd_green_ap_init(struct hdd_context_s *hdd_ctx)
+void hdd_green_ap_init(struct hdd_context *hdd_ctx)
 {
 	if (!QDF_IS_STATUS_SUCCESS(hdd_green_ap_attach(hdd_ctx)))
 		hdd_err("Failed to allocate Green-AP resource");
@@ -383,7 +383,7 @@ void hdd_green_ap_init(struct hdd_context_s *hdd_ctx)
  * hdd_green_ap_deinit() - De-initialize Green AP feature
  * (public function documented in wlan_hdd_green_ap.h)
  */
-void hdd_green_ap_deinit(struct hdd_context_s *hdd_ctx)
+void hdd_green_ap_deinit(struct hdd_context *hdd_ctx)
 {
 	if (!QDF_IS_STATUS_SUCCESS(hdd_green_ap_deattach(hdd_ctx)))
 		hdd_err("Cannot deallocate Green-AP resource");
@@ -413,7 +413,7 @@ static bool hdd_is_egap_enabled(bool fw_egap_support, struct hdd_config *cfg)
  *
  * Return: 0 on success, negative errno on failure
  */
-int hdd_enable_egap(struct hdd_context_s *hdd_ctx)
+int hdd_enable_egap(struct hdd_context *hdd_ctx)
 {
 	struct hdd_config *cfg;
 
@@ -450,7 +450,7 @@ int hdd_enable_egap(struct hdd_context_s *hdd_ctx)
  * hdd_green_ap_start_bss() - Notify Green AP of Start BSS event
  * (public function documented in wlan_hdd_green_ap.h)
  */
-void hdd_green_ap_start_bss(struct hdd_context_s *hdd_ctx)
+void hdd_green_ap_start_bss(struct hdd_context *hdd_ctx)
 {
 	struct hdd_config *cfg;
 
@@ -494,7 +494,7 @@ void hdd_green_ap_start_bss(struct hdd_context_s *hdd_ctx)
  * hdd_green_ap_stop_bss() - Notify Green AP of Stop BSS event
  * (public function documented in wlan_hdd_green_ap.h)
  */
-void hdd_green_ap_stop_bss(struct hdd_context_s *hdd_ctx)
+void hdd_green_ap_stop_bss(struct hdd_context *hdd_ctx)
 {
 	struct hdd_config *cfg;
 
@@ -531,7 +531,7 @@ void hdd_green_ap_stop_bss(struct hdd_context_s *hdd_ctx)
  * hdd_green_ap_add_sta() - Notify Green AP of Add Station event
  * (public function documented in wlan_hdd_green_ap.h)
  */
-void hdd_green_ap_add_sta(struct hdd_context_s *hdd_ctx)
+void hdd_green_ap_add_sta(struct hdd_context *hdd_ctx)
 {
 	struct hdd_config *cfg;
 
@@ -563,7 +563,7 @@ void hdd_green_ap_add_sta(struct hdd_context_s *hdd_ctx)
  * hdd_green_ap_del_sta() - Notify Green AP of Delete Station event
  * (public function documented in wlan_hdd_green_ap.h)
  */
-void hdd_green_ap_del_sta(struct hdd_context_s *hdd_ctx)
+void hdd_green_ap_del_sta(struct hdd_context *hdd_ctx)
 {
 	struct hdd_config *cfg;
 
@@ -598,7 +598,7 @@ void hdd_green_ap_del_sta(struct hdd_context_s *hdd_ctx)
  * Implementation notes:
  * Target indicates whether or not Enhanced Green AP (EGAP) is supported
  */
-void hdd_green_ap_target_config(struct hdd_context_s *hdd_ctx,
+void hdd_green_ap_target_config(struct hdd_context *hdd_ctx,
 				struct wma_tgt_cfg *target_config)
 {
 	struct hdd_green_ap_ctx *green_ap = hdd_ctx->green_ap_ctx;
diff --git a/core/hdd/src/wlan_hdd_green_ap.h b/core/hdd/src/wlan_hdd_green_ap.h
index 6cadd71ff0ec..0d0f8659f9d0 100644
--- a/core/hdd/src/wlan_hdd_green_ap.h
+++ b/core/hdd/src/wlan_hdd_green_ap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -34,7 +34,7 @@
  * WLAN Host Device Driver Green AP API specification
  */
 
-struct hdd_context_s;
+struct hdd_context;
 struct wma_tgt_cfg;
 
 #ifdef FEATURE_GREEN_AP
@@ -44,7 +44,7 @@ struct wma_tgt_cfg;
  *
  * Return: none
  */
-void hdd_green_ap_init(struct hdd_context_s *hdd_ctx);
+void hdd_green_ap_init(struct hdd_context *hdd_ctx);
 
 /**
  * hdd_green_ap_deinit() - De-initialize Green AP feature
@@ -52,7 +52,7 @@ void hdd_green_ap_init(struct hdd_context_s *hdd_ctx);
  *
  * Return: none
  */
-void hdd_green_ap_deinit(struct hdd_context_s *hdd_ctx);
+void hdd_green_ap_deinit(struct hdd_context *hdd_ctx);
 
 /**
  * hdd_green_ap_start_bss() - Notify Green AP of Start BSS event
@@ -60,7 +60,7 @@ void hdd_green_ap_deinit(struct hdd_context_s *hdd_ctx);
  *
  * Return: none
  */
-void hdd_green_ap_start_bss(struct hdd_context_s *hdd_ctx);
+void hdd_green_ap_start_bss(struct hdd_context *hdd_ctx);
 
 /**
  * hdd_green_ap_stop_bss() - Notify Green AP of Stop BSS event
@@ -68,7 +68,7 @@ void hdd_green_ap_start_bss(struct hdd_context_s *hdd_ctx);
  *
  * Return: none
  */
-void hdd_green_ap_stop_bss(struct hdd_context_s *hdd_ctx);
+void hdd_green_ap_stop_bss(struct hdd_context *hdd_ctx);
 
 /**
  * hdd_green_ap_add_sta() - Notify Green AP of Add Station event
@@ -76,7 +76,7 @@ void hdd_green_ap_stop_bss(struct hdd_context_s *hdd_ctx);
  *
  * Return: none
  */
-void hdd_green_ap_add_sta(struct hdd_context_s *hdd_ctx);
+void hdd_green_ap_add_sta(struct hdd_context *hdd_ctx);
 
 /**
  * hdd_green_ap_del_sta() - Notify Green AP of Delete Station event
@@ -84,7 +84,7 @@ void hdd_green_ap_add_sta(struct hdd_context_s *hdd_ctx);
  *
  * Return: none
  */
-void hdd_green_ap_del_sta(struct hdd_context_s *hdd_ctx);
+void hdd_green_ap_del_sta(struct hdd_context *hdd_ctx);
 
 /**
  * hdd_enable_egap() - Enable Enhance Green AP
@@ -92,7 +92,7 @@ void hdd_green_ap_del_sta(struct hdd_context_s *hdd_ctx);
  *
  * Return: 0 on success, negative errno on failure
  */
-int hdd_enable_egap(struct hdd_context_s *hdd_ctx);
+int hdd_enable_egap(struct hdd_context *hdd_ctx);
 
 /**
  * hdd_green_ap_target_config() - Handle Green AP target configuration
@@ -104,20 +104,20 @@ int hdd_enable_egap(struct hdd_context_s *hdd_ctx);
  *
  * Return: none
  */
-void hdd_green_ap_target_config(struct hdd_context_s *hdd_ctx,
+void hdd_green_ap_target_config(struct hdd_context *hdd_ctx,
 				struct wma_tgt_cfg *target_config);
 #else
-static inline void hdd_green_ap_init(struct hdd_context_s *hdd_ctx) {}
-static inline void hdd_green_ap_deinit(struct hdd_context_s *hdd_ctx) {}
-static inline void hdd_green_ap_start_bss(struct hdd_context_s *hdd_ctx) {}
-static inline void hdd_green_ap_stop_bss(struct hdd_context_s *hdd_ctx) {}
-static inline void hdd_green_ap_add_sta(struct hdd_context_s *hdd_ctx) {}
-static inline void hdd_green_ap_del_sta(struct hdd_context_s *hdd_ctx) {}
-static inline int hdd_enable_egap(struct hdd_context_s *hdd_ctx)
+static inline void hdd_green_ap_init(struct hdd_context *hdd_ctx) {}
+static inline void hdd_green_ap_deinit(struct hdd_context *hdd_ctx) {}
+static inline void hdd_green_ap_start_bss(struct hdd_context *hdd_ctx) {}
+static inline void hdd_green_ap_stop_bss(struct hdd_context *hdd_ctx) {}
+static inline void hdd_green_ap_add_sta(struct hdd_context *hdd_ctx) {}
+static inline void hdd_green_ap_del_sta(struct hdd_context *hdd_ctx) {}
+static inline int hdd_enable_egap(struct hdd_context *hdd_ctx)
 {
 	return -EINVAL;
 }
-static inline void hdd_green_ap_target_config(struct hdd_context_s *hdd_ctx,
+static inline void hdd_green_ap_target_config(struct hdd_context *hdd_ctx,
 					      struct wma_tgt_cfg *target_config)
 {
 }
diff --git a/core/hdd/src/wlan_hdd_he.c b/core/hdd/src/wlan_hdd_he.c
index 7edc01229a64..6466a84060ec 100644
--- a/core/hdd/src/wlan_hdd_he.c
+++ b/core/hdd/src/wlan_hdd_he.c
@@ -116,7 +116,7 @@ static const char *hdd_he_wni_cfg_to_string(uint16_t cfg_id)
  *
  * Return: 0 on success and errno on failure
  */
-static int hdd_he_set_wni_cfg(struct hdd_context_s *hdd_ctx,
+static int hdd_he_set_wni_cfg(struct hdd_context *hdd_ctx,
 				     uint16_t cfg_id, uint32_t new_value)
 {
 	QDF_STATUS status;
@@ -128,7 +128,7 @@ static int hdd_he_set_wni_cfg(struct hdd_context_s *hdd_ctx,
 	return qdf_status_to_os_return(status);
 }
 
-void hdd_update_tgt_he_cap(struct hdd_context_s *hdd_ctx,
+void hdd_update_tgt_he_cap(struct hdd_context *hdd_ctx,
 			   struct wma_tgt_cfg *cfg)
 {
 	uint32_t ppet_size = sizeof(tDot11fIEppe_threshold);
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index 2da6132d015e..615e726edc02 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -3475,7 +3475,7 @@ static int __iw_softap_get_three(struct net_device *dev,
 	uint32_t *value = (uint32_t *)extra;
 	uint32_t sub_cmd = value[0];
 	int ret = 0; /* success */
-	struct hdd_context_s *hdd_ctx;
+	struct hdd_context *hdd_ctx;
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
diff --git a/core/hdd/src/wlan_hdd_lpass.c b/core/hdd/src/wlan_hdd_lpass.c
index 1a766841cbcc..9399c0f56e0a 100644
--- a/core/hdd/src/wlan_hdd_lpass.c
+++ b/core/hdd/src/wlan_hdd_lpass.c
@@ -280,7 +280,7 @@ static void wlan_hdd_send_version_pkg(uint32_t fw_version,
  *
  * Return: none
  */
-static void wlan_hdd_send_all_scan_intf_info(struct hdd_context_s *hdd_ctx)
+static void wlan_hdd_send_all_scan_intf_info(struct hdd_context *hdd_ctx)
 {
 	hdd_adapter_t *adapter = NULL;
 	hdd_adapter_list_node_t *node = NULL, *next = NULL;
@@ -316,7 +316,7 @@ static void wlan_hdd_send_all_scan_intf_info(struct hdd_context_s *hdd_ctx)
  * hdd_lpass_target_config() - Handle LPASS target configuration
  * (public function documented in wlan_hdd_lpass.h)
  */
-void hdd_lpass_target_config(struct hdd_context_s *hdd_ctx,
+void hdd_lpass_target_config(struct hdd_context *hdd_ctx,
 			     struct wma_tgt_cfg *target_config)
 {
 	hdd_ctx->lpss_support = target_config->lpss_support;
@@ -327,7 +327,7 @@ void hdd_lpass_target_config(struct hdd_context_s *hdd_ctx,
  * (public function documented in wlan_hdd_lpass.h)
  */
 void hdd_lpass_populate_cds_config(struct cds_config_info *cds_config,
-				   struct hdd_context_s *hdd_ctx)
+				   struct hdd_context *hdd_ctx)
 {
 	cds_config->is_lpass_enabled = hdd_ctx->config->enable_lpass_support;
 }
@@ -337,7 +337,7 @@ void hdd_lpass_populate_cds_config(struct cds_config_info *cds_config,
  * (public function documented in wlan_hdd_lpass.h)
  */
 void hdd_lpass_populate_pmo_config(struct pmo_psoc_cfg *pmo_config,
-				   struct hdd_context_s *hdd_ctx)
+				   struct hdd_context *hdd_ctx)
 {
 	pmo_config->lpass_enable = hdd_ctx->config->enable_lpass_support;
 }
@@ -385,7 +385,7 @@ void hdd_lpass_notify_disconnect(struct hdd_adapter *adapter)
  */
 void hdd_lpass_notify_mode_change(struct hdd_adapter *adapter)
 {
-	struct hdd_context_s *hdd_ctx;
+	struct hdd_context *hdd_ctx;
 
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	wlan_hdd_send_all_scan_intf_info(hdd_ctx);
@@ -395,7 +395,7 @@ void hdd_lpass_notify_mode_change(struct hdd_adapter *adapter)
  * hdd_lpass_notify_start() - Notify LPASS of driver start
  * (public function documented in wlan_hdd_lpass.h)
  */
-void hdd_lpass_notify_start(struct hdd_context_s *hdd_ctx)
+void hdd_lpass_notify_start(struct hdd_context *hdd_ctx)
 {
 	wlan_hdd_send_all_scan_intf_info(hdd_ctx);
 	wlan_hdd_send_version_pkg(hdd_ctx->target_fw_version,
@@ -407,7 +407,7 @@ void hdd_lpass_notify_start(struct hdd_context_s *hdd_ctx)
  * hdd_lpass_notify_stop() - Notify LPASS of driver stop
  * (public function documented in wlan_hdd_lpass.h)
  */
-void hdd_lpass_notify_stop(struct hdd_context_s *hdd_ctx)
+void hdd_lpass_notify_stop(struct hdd_context *hdd_ctx)
 {
 	wlan_hdd_send_status_pkg(NULL, NULL, 0, 0);
 }
@@ -416,7 +416,7 @@ void hdd_lpass_notify_stop(struct hdd_context_s *hdd_ctx)
  * hdd_lpass_is_supported() - Is lpass feature supported?
  * (public function documented in wlan_hdd_lpass.h)
  */
-bool hdd_lpass_is_supported(struct hdd_context_s *hdd_ctx)
+bool hdd_lpass_is_supported(struct hdd_context *hdd_ctx)
 {
 	return hdd_ctx->config->enable_lpass_support;
 }
diff --git a/core/hdd/src/wlan_hdd_lpass.h b/core/hdd/src/wlan_hdd_lpass.h
index ac4459773fea..14811b7ac846 100644
--- a/core/hdd/src/wlan_hdd_lpass.h
+++ b/core/hdd/src/wlan_hdd_lpass.h
@@ -30,7 +30,7 @@
 
 struct cds_config_info;
 struct wma_tgt_cfg;
-struct hdd_context_s;
+struct hdd_context;
 struct hdd_adapter;
 
 #ifdef WLAN_FEATURE_LPSS
@@ -44,7 +44,7 @@ struct hdd_adapter;
  *
  * Return: none
  */
-void hdd_lpass_target_config(struct hdd_context_s *hdd_ctx,
+void hdd_lpass_target_config(struct hdd_context *hdd_ctx,
 			     struct wma_tgt_cfg *target_config);
 
 /**
@@ -58,7 +58,7 @@ void hdd_lpass_target_config(struct hdd_context_s *hdd_ctx,
  * Return: none
  */
 void hdd_lpass_populate_cds_config(struct cds_config_info *cds_config,
-				   struct hdd_context_s *hdd_ctx);
+				   struct hdd_context *hdd_ctx);
 
 /**
  * hdd_lpass_populate_pmo_config() - Populate LPASS configuration
@@ -71,7 +71,7 @@ void hdd_lpass_populate_cds_config(struct cds_config_info *cds_config,
  * Return: none
  */
 void hdd_lpass_populate_pmo_config(struct pmo_psoc_cfg *pmo_config,
-				   struct hdd_context_s *hdd_ctx);
+				   struct hdd_context *hdd_ctx);
 
 /**
  * hdd_lpass_notify_connect() - Notify LPASS of interface connect
@@ -115,7 +115,7 @@ void hdd_lpass_notify_mode_change(struct hdd_adapter *adapter);
  *
  * Return: none
  */
-void hdd_lpass_notify_start(struct hdd_context_s *hdd_ctx);
+void hdd_lpass_notify_start(struct hdd_context *hdd_ctx);
 
 /**
  * hdd_lpass_notify_stop() - Notify LPASS of driver stop
@@ -126,7 +126,7 @@ void hdd_lpass_notify_start(struct hdd_context_s *hdd_ctx);
  *
  * Return: none
  */
-void hdd_lpass_notify_stop(struct hdd_context_s *hdd_ctx);
+void hdd_lpass_notify_stop(struct hdd_context *hdd_ctx);
 
 /**
  * hdd_lpass_is_supported() - Is lpass feature supported?
@@ -135,22 +135,22 @@ void hdd_lpass_notify_stop(struct hdd_context_s *hdd_ctx);
  * Return: true if feature is enabled and supported by firmware, false
  * if the feature is not enabled or not supported by firmware.
  */
-bool hdd_lpass_is_supported(struct hdd_context_s *hdd_ctx);
+bool hdd_lpass_is_supported(struct hdd_context *hdd_ctx);
 
 #else
-static inline void hdd_lpass_target_config(struct hdd_context_s *hdd_ctx,
+static inline void hdd_lpass_target_config(struct hdd_context *hdd_ctx,
 					   struct wma_tgt_cfg *target_config)
 {
 }
 static inline
 void hdd_lpass_populate_cds_config(struct cds_config_info *cds_config,
-				   struct hdd_context_s *hdd_ctx)
+				   struct hdd_context *hdd_ctx)
 {
 }
 
 static inline
 void hdd_lpass_populate_pmo_config(struct pmo_psoc_cfg *pmo_config,
-				   struct hdd_context_s *hdd_ctx)
+				   struct hdd_context *hdd_ctx)
 {
 }
 
@@ -163,9 +163,9 @@ static inline void hdd_lpass_notify_disconnect(struct hdd_adapter *adapter)
 static inline void hdd_lpass_notify_mode_change(struct hdd_adapter *adapter)
 {
 }
-static inline void hdd_lpass_notify_start(struct hdd_context_s *hdd_ctx) { }
-static inline void hdd_lpass_notify_stop(struct hdd_context_s *hdd_ctx) { }
-static inline bool hdd_lpass_is_supported(struct hdd_context_s *hdd_ctx)
+static inline void hdd_lpass_notify_start(struct hdd_context *hdd_ctx) { }
+static inline void hdd_lpass_notify_stop(struct hdd_context *hdd_ctx) { }
+static inline bool hdd_lpass_is_supported(struct hdd_context *hdd_ctx)
 {
 	return false;
 }
diff --git a/core/hdd/src/wlan_hdd_nan_datapath.h b/core/hdd/src/wlan_hdd_nan_datapath.h
index 081283e36bcf..1a89ba799b33 100644
--- a/core/hdd/src/wlan_hdd_nan_datapath.h
+++ b/core/hdd/src/wlan_hdd_nan_datapath.h
@@ -26,7 +26,7 @@
 #ifndef __WLAN_HDD_NAN_DATAPATH_H
 #define __WLAN_HDD_NAN_DATAPATH_H
 
-struct hdd_context_s;
+struct hdd_context;
 struct hdd_tgt_cfg;
 struct hdd_config;
 struct hdd_adapter;
@@ -209,8 +209,8 @@ struct nan_datapath_ctx {
 #endif
 
 #ifdef WLAN_FEATURE_NAN_DATAPATH
-void hdd_ndp_print_ini_config(struct hdd_context_s *hdd_ctx);
-void hdd_nan_datapath_target_config(struct hdd_context_s *hdd_ctx,
+void hdd_ndp_print_ini_config(struct hdd_context *hdd_ctx);
+void hdd_nan_datapath_target_config(struct hdd_context *hdd_ctx,
 						struct wma_tgt_cfg *cfg);
 void hdd_ndp_event_handler(struct hdd_adapter *adapter,
 	tCsrRoamInfo *roam_info, uint32_t roam_id, eRoamCmdStatus roam_status,
@@ -220,10 +220,10 @@ int wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy,
 int hdd_init_nan_data_mode(struct hdd_adapter *adapter);
 void hdd_ndp_session_end_handler(hdd_adapter_t *adapter);
 #else
-static inline void hdd_ndp_print_ini_config(struct hdd_context_s *hdd_ctx)
+static inline void hdd_ndp_print_ini_config(struct hdd_context *hdd_ctx)
 {
 }
-static inline void hdd_nan_datapath_target_config(struct hdd_context_s *hdd_ctx,
+static inline void hdd_nan_datapath_target_config(struct hdd_context *hdd_ctx,
 						struct wma_tgt_cfg *cfg)
 {
 }
diff --git a/core/hdd/src/wlan_hdd_napi.c b/core/hdd/src/wlan_hdd_napi.c
index 0c8172653cd2..705c8bbc9159 100644
--- a/core/hdd/src/wlan_hdd_napi.c
+++ b/core/hdd/src/wlan_hdd_napi.c
@@ -275,7 +275,7 @@ int hdd_napi_event(enum qca_napi_event event, void *data)
  *         !0: error, or action error code
  */
 static int napi_tput_policy_delay;
-int hdd_napi_apply_throughput_policy(struct hdd_context_s *hddctx,
+int hdd_napi_apply_throughput_policy(struct hdd_context *hddctx,
 				     uint64_t              tx_packets,
 				     uint64_t              rx_packets)
 {
diff --git a/core/hdd/src/wlan_hdd_oemdata.c b/core/hdd/src/wlan_hdd_oemdata.c
index d6f49c3b6782..9d4a86a8725f 100644
--- a/core/hdd/src/wlan_hdd_oemdata.c
+++ b/core/hdd/src/wlan_hdd_oemdata.c
@@ -51,7 +51,7 @@
 #include <net/cnss_nl.h>
 #endif
 
-static struct hdd_context_s *p_hdd_ctx;
+static struct hdd_context *p_hdd_ctx;
 
 /**
  * populate_oem_data_cap() - populate oem capabilities
@@ -790,7 +790,7 @@ void hdd_send_peer_status_ind_to_oem_app(struct qdf_mac_addr *peerMac,
  *
  * Return: 0 if success, error code otherwise
  */
-static int oem_app_reg_req_handler(struct hdd_context_s *hdd_ctx,
+static int oem_app_reg_req_handler(struct hdd_context *hdd_ctx,
 					tAniMsgHdr *msg_hdr, int pid)
 {
 	char *sign_str = NULL;
@@ -825,7 +825,7 @@ static int oem_app_reg_req_handler(struct hdd_context_s *hdd_ctx,
  *
  * Return: 0 if success, error code otherwise
  */
-static int oem_data_req_handler(struct hdd_context_s *hdd_ctx,
+static int oem_data_req_handler(struct hdd_context *hdd_ctx,
 				tAniMsgHdr *msg_hdr, int pid)
 {
 	hdd_debug("Received Oem Data Request length: %d from pid: %d",
@@ -862,7 +862,7 @@ static int oem_data_req_handler(struct hdd_context_s *hdd_ctx,
  *
  * Return: 0 if success, error code otherwise
  */
-static int oem_chan_info_req_handler(struct hdd_context_s *hdd_ctx,
+static int oem_chan_info_req_handler(struct hdd_context *hdd_ctx,
 					tAniMsgHdr *msg_hdr, int pid)
 {
 	hdd_debug("Received channel info request, num channel(%d) from pid: %d",
@@ -899,7 +899,7 @@ static int oem_chan_info_req_handler(struct hdd_context_s *hdd_ctx,
  *
  * Return: 0 if success, error code otherwise
  */
-static int oem_set_cap_req_handler(struct hdd_context_s *hdd_ctx,
+static int oem_set_cap_req_handler(struct hdd_context *hdd_ctx,
 					tAniMsgHdr *msg_hdr, int pid)
 {
 	hdd_info("Received set oem cap req of length:%d from pid: %d",
@@ -936,7 +936,7 @@ static int oem_set_cap_req_handler(struct hdd_context_s *hdd_ctx,
  *
  * Return: 0 if success, error code otherwise
  */
-static int oem_get_cap_req_handler(struct hdd_context_s *hdd_ctx,
+static int oem_get_cap_req_handler(struct hdd_context *hdd_ctx,
 					tAniMsgHdr *msg_hdr, int pid)
 {
 	hdd_info("Rcvd get oem capability req - length:%d from pid: %d",
@@ -1062,7 +1062,7 @@ static void oem_cmd_handler(const void *data, int data_len, void *ctx, int pid)
  *
  * Return: 0
  */
-int oem_activate_service(struct hdd_context_s *hdd_ctx)
+int oem_activate_service(struct hdd_context *hdd_ctx)
 {
 	p_hdd_ctx = hdd_ctx;
 	register_cld_cmd_cb(WLAN_NL_MSG_OEM, oem_cmd_handler, NULL);
@@ -1144,7 +1144,7 @@ static int __oem_msg_callback(struct sk_buff *skb)
  * Return: zero on success
  *         On error, error number will be returned.
  */
-int oem_activate_service(struct hdd_context_s *hdd_ctx)
+int oem_activate_service(struct hdd_context *hdd_ctx)
 {
 	p_hdd_ctx = hdd_ctx;
 
diff --git a/core/hdd/src/wlan_hdd_tsf.c b/core/hdd/src/wlan_hdd_tsf.c
index 60a06174e0f8..303ad789436c 100644
--- a/core/hdd/src/wlan_hdd_tsf.c
+++ b/core/hdd/src/wlan_hdd_tsf.c
@@ -1052,7 +1052,7 @@ int hdd_indicate_tsf(hdd_adapter_t *adapter, uint32_t *buf, int len)
  */
 int hdd_get_tsf_cb(void *pcb_cxt, struct stsf *ptsf)
 {
-	struct hdd_context_s *hddctx;
+	struct hdd_context *hddctx;
 	struct hdd_adapter *adapter;
 	int status;
 
@@ -1061,7 +1061,7 @@ int hdd_get_tsf_cb(void *pcb_cxt, struct stsf *ptsf)
 			return -EINVAL;
 	}
 
-	hddctx = (struct hdd_context_s *)pcb_cxt;
+	hddctx = (struct hdd_context *)pcb_cxt;
 	status = wlan_hdd_validate_context(hddctx);
 	if (0 != status)
 		return -EINVAL;
@@ -1235,14 +1235,14 @@ int wlan_hdd_cfg80211_handle_tsf_cmd(struct wiphy *wiphy,
 
 /**
  * wlan_hdd_tsf_init() - set callback to handle tsf value.
- * @hdd_ctx: pointer to the struct hdd_context_s
+ * @hdd_ctx: pointer to the struct hdd_context
  *
  * This function set the callback to sme module, the callback will be
  * called when a tsf event is reported by firmware
  *
  * Return: none
  */
-void wlan_hdd_tsf_init(struct hdd_context_s *hdd_ctx)
+void wlan_hdd_tsf_init(struct hdd_context *hdd_ctx)
 {
 	QDF_STATUS hal_status;
 
diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c
index d8bd8f79c74b..997d93344e9b 100644
--- a/core/hdd/src/wlan_hdd_wext.c
+++ b/core/hdd/src/wlan_hdd_wext.c
@@ -2974,14 +2974,14 @@ static int hdd_check_wext_control(enum hdd_wext_control wext_control,
 	}
 }
 
-int hdd_check_standard_wext_control(struct hdd_context_s *hdd_ctx,
+int hdd_check_standard_wext_control(struct hdd_context *hdd_ctx,
 				    struct iw_request_info *info)
 {
 	return hdd_check_wext_control(hdd_ctx->config->standard_wext_control,
 				      info);
 }
 
-int hdd_check_private_wext_control(struct hdd_context_s *hdd_ctx,
+int hdd_check_private_wext_control(struct hdd_context *hdd_ctx,
 				   struct iw_request_info *info)
 {
 	return hdd_check_wext_control(hdd_ctx->config->private_wext_control,