diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h
index 5f07425a5e19..e0318f7c85eb 100644
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -1017,10 +1017,10 @@ struct hdd_adapter {
 	enum tQDF_ADAPTER_MODE device_mode;
 
 	/** IPv4 notifier callback for handling ARP offload on change in IP */
-	struct work_struct ipv4NotifierWorkQueue;
+	struct work_struct ipv4_notifier_work;
 #ifdef WLAN_NS_OFFLOAD
 	/** IPv6 notifier callback for handling NS offload on change in IP */
-	struct work_struct ipv6NotifierWorkQueue;
+	struct work_struct ipv6_notifier_work;
 #endif
 
 	/* TODO Move this to sta Ctx */
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 7119583f108f..bad43df736cb 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -3976,7 +3976,7 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio
 		 * Workqueue which gets scheduled in IPv4 notification
 		 * callback
 		 */
-		INIT_WORK(&adapter->ipv4NotifierWorkQueue,
+		INIT_WORK(&adapter->ipv4_notifier_work,
 			  hdd_ipv4_notifier_work_queue);
 
 #ifdef WLAN_NS_OFFLOAD
@@ -3984,7 +3984,7 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio
 		 * Workqueue which gets scheduled in IPv6
 		 * notification callback.
 		 */
-		INIT_WORK(&adapter->ipv6NotifierWorkQueue,
+		INIT_WORK(&adapter->ipv6_notifier_work,
 			  hdd_ipv6_notifier_work_queue);
 #endif
 		status = hdd_register_interface(adapter, rtnl_held);
@@ -4039,7 +4039,7 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio
 		 * Workqueue which gets scheduled in IPv4 notification
 		 * callback
 		 */
-		INIT_WORK(&adapter->ipv4NotifierWorkQueue,
+		INIT_WORK(&adapter->ipv4_notifier_work,
 			  hdd_ipv4_notifier_work_queue);
 
 #ifdef WLAN_NS_OFFLOAD
@@ -4047,7 +4047,7 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio
 		 * Workqueue which gets scheduled in IPv6
 		 * notification callback.
 		 */
-		INIT_WORK(&adapter->ipv6NotifierWorkQueue,
+		INIT_WORK(&adapter->ipv6_notifier_work,
 			  hdd_ipv6_notifier_work_queue);
 #endif
 		break;
@@ -4347,14 +4347,14 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *ada
 		hdd_clear_fils_connection_info(adapter);
 
 #ifdef WLAN_OPEN_SOURCE
-		cancel_work_sync(&adapter->ipv4NotifierWorkQueue);
+		cancel_work_sync(&adapter->ipv4_notifier_work);
 #endif
 
 		hdd_deregister_tx_flow_control(adapter);
 
 #ifdef WLAN_NS_OFFLOAD
 #ifdef WLAN_OPEN_SOURCE
-		cancel_work_sync(&adapter->ipv6NotifierWorkQueue);
+		cancel_work_sync(&adapter->ipv6_notifier_work);
 #endif
 #endif
 
@@ -4463,12 +4463,12 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *ada
 		mutex_unlock(&hdd_ctx->sap_lock);
 
 #ifdef WLAN_OPEN_SOURCE
-		cancel_work_sync(&adapter->ipv4NotifierWorkQueue);
+		cancel_work_sync(&adapter->ipv4_notifier_work);
 #endif
 
 #ifdef WLAN_NS_OFFLOAD
 #ifdef WLAN_OPEN_SOURCE
-		cancel_work_sync(&adapter->ipv6NotifierWorkQueue);
+		cancel_work_sync(&adapter->ipv6_notifier_work);
 #endif
 #endif
 		break;
diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c
index 2534b8ba1839..2d22a0d490cb 100644
--- a/core/hdd/src/wlan_hdd_nan_datapath.c
+++ b/core/hdd/src/wlan_hdd_nan_datapath.c
@@ -136,13 +136,13 @@ static int hdd_close_ndi(struct hdd_adapter *adapter)
 				     WLAN_CONTROL_PATH);
 
 #ifdef WLAN_OPEN_SOURCE
-	cancel_work_sync(&adapter->ipv4NotifierWorkQueue);
+	cancel_work_sync(&adapter->ipv4_notifier_work);
 #endif
 	hdd_deregister_tx_flow_control(adapter);
 
 #ifdef WLAN_NS_OFFLOAD
 #ifdef WLAN_OPEN_SOURCE
-	cancel_work_sync(&adapter->ipv6NotifierWorkQueue);
+	cancel_work_sync(&adapter->ipv6_notifier_work);
 #endif
 #endif
 	errno = hdd_vdev_destroy(adapter);
diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c
index cf07dd3b67c7..e04780bc371f 100644
--- a/core/hdd/src/wlan_hdd_power.c
+++ b/core/hdd/src/wlan_hdd_power.c
@@ -229,7 +229,7 @@ static int __wlan_hdd_ipv6_changed(struct notifier_block *nb,
 
 		hdd_debug("invoking sme_dhcp_done_ind");
 		sme_dhcp_done_ind(hdd_ctx->hHal, adapter->sessionId);
-		schedule_work(&adapter->ipv6NotifierWorkQueue);
+		schedule_work(&adapter->ipv6_notifier_work);
 	}
 
 exit:
@@ -471,7 +471,7 @@ static void __hdd_ipv6_notifier_work_queue(struct work_struct *work)
 
 	ENTER();
 
-	adapter = container_of(work, struct hdd_adapter, ipv6NotifierWorkQueue);
+	adapter = container_of(work, struct hdd_adapter, ipv6_notifier_work);
 	errno = hdd_validate_adapter(adapter);
 	if (errno)
 		goto exit;
@@ -734,7 +734,7 @@ static void __hdd_ipv4_notifier_work_queue(struct work_struct *work)
 
 	ENTER();
 
-	adapter = container_of(work, struct hdd_adapter, ipv4NotifierWorkQueue);
+	adapter = container_of(work, struct hdd_adapter, ipv4_notifier_work);
 	errno = hdd_validate_adapter(adapter);
 	if (errno)
 		goto exit;
@@ -831,7 +831,7 @@ static int __wlan_hdd_ipv4_changed(struct notifier_block *nb,
 
 		ifa = hdd_lookup_ifaddr(adapter);
 		if (ifa && ifa->ifa_local)
-			schedule_work(&adapter->ipv4NotifierWorkQueue);
+			schedule_work(&adapter->ipv4_notifier_work);
 	}
 
 exit: