diff --git a/doc/wifi.md b/doc/wifi.md
index ddb83802..9cf1e07a 100644
--- a/doc/wifi.md
+++ b/doc/wifi.md
@@ -86,7 +86,7 @@ admin@example:/config/hardware/component/radio0/wifi-radio/> leave
 - `country-code`: Two-letter ISO 3166-1 code - determines allowed channels and maximum power. Examples: US, DE, GB, SE, FR, JP. **Must match your physical location for legal compliance.**
 - `band`: 2.4GHz, 5GHz, or 6GHz (required for AP mode). Band selection automatically enables appropriate WiFi standards (2.4GHz: 802.11n, 5GHz: 802.11n/ac, 6GHz: 802.11n/ac/ax)
 - `channel`: Channel number (1-196) or "auto" (required for AP mode). When set to "auto", defaults to channel 6 for 2.4GHz, channel 36 for 5GHz, or channel 109 for 6GHz
-- `enable-wifi6`: Boolean (default: false). Opt-in to enable WiFi 6 (802.11ax) on 2.4GHz and 5GHz bands. The 6GHz band always uses WiFi 6 regardless of this setting
+- `enable-80211ax`: Boolean (default: false). Opt-in to enable 802.11ax (WiFi 6) on 2.4GHz and 5GHz bands. The 6GHz band always uses 802.11ax regardless of this setting
 
 > [!NOTE]
 > TX power and channel width are automatically determined by the driver based on regulatory constraints, PHY mode, and hardware capabilities.
@@ -105,7 +105,7 @@ admin@example:/config/> edit hardware component radio0 wifi-radio
 admin@example:/config/hardware/component/radio0/wifi-radio/> set country-code DE
 admin@example:/config/hardware/component/radio0/wifi-radio/> set band 5GHz
 admin@example:/config/hardware/component/radio0/wifi-radio/> set channel 36
-admin@example:/config/hardware/component/radio0/wifi-radio/> set enable-wifi6 true
+admin@example:/config/hardware/component/radio0/wifi-radio/> set enable-80211ax true
 admin@example:/config/hardware/component/radio0/wifi-radio/> leave
 ```
 
@@ -121,7 +121,7 @@ admin@example:/config/hardware/component/radio0/wifi-radio/> leave
 - Older WiFi 5/4 clients can still connect but won't use WiFi 6 features
 
 > [!NOTE]
-> The 6GHz band always uses WiFi 6 (802.11ax) regardless of the `enable-wifi6`
+> The 6GHz band always uses WiFi 6 (802.11ax) regardless of the `enable-80211ax`
 > setting, as WiFi 6E requires 802.11ax support.
 
 ## Discovering Available Networks (Scanning)
diff --git a/src/confd/src/hardware.c b/src/confd/src/hardware.c
index e3a7fe75..d7e7d872 100644
--- a/src/confd/src/hardware.c
+++ b/src/confd/src/hardware.c
@@ -413,7 +413,7 @@ static int wifi_gen_aps_on_radio(const char *radio_name, struct lyd_node *cifs,
 	char hostapd_conf[256];
 	char **ap_list = NULL;
 	FILE *hostapd = NULL;
-	bool wifi6_enabled;
+	bool ax_enabled;
 	int ap_count = 0;
 	char bssid[18];
 	int i;
@@ -459,7 +459,7 @@ static int wifi_gen_aps_on_radio(const char *radio_name, struct lyd_node *cifs,
 	country = lydx_get_cattr(radio_node, "country-code");
 	band = lydx_get_cattr(radio_node, "band");
 	channel = lydx_get_cattr(radio_node, "channel");
-	wifi6_enabled = lydx_get_bool(radio_node, "enable_wifi6");
+	ax_enabled = lydx_get_bool(radio_node, "enable-80211ax");
 
 	/* Get secret from keystore if not open network */
 	if (secret_name && strcmp(security_mode, "open") != 0) {
@@ -544,20 +544,20 @@ static int wifi_gen_aps_on_radio(const char *radio_name, struct lyd_node *cifs,
 
 	if (band) {
 		if (!strcmp(band, "2.4GHz")) {
-			/* 2.4GHz: Enable 802.11n (HT), optionally WiFi 6 */
+			/* 2.4GHz: Enable 802.11n (HT), optionally 802.11ax */
 			fprintf(hostapd, "ieee80211n=1\n");
-			if (wifi6_enabled) {
+			if (ax_enabled) {
 				fprintf(hostapd, "ieee80211ax=1\n");
 			}
 		} else if (!strcmp(band, "5GHz")) {
-			/* 5GHz: Enable 802.11n and 802.11ac, optionally WiFi 6 */
+			/* 5GHz: Enable 802.11n and 802.11ac, optionally 802.11ax */
 			fprintf(hostapd, "ieee80211n=1\n");
 			fprintf(hostapd, "ieee80211ac=1\n");
-			if (wifi6_enabled) {
+			if (ax_enabled) {
 				fprintf(hostapd, "ieee80211ax=1\n");
 			}
 		} else if (!strcmp(band, "6GHz")) {
-			/* 6GHz: Enable 802.11ax (WiFi 6E required) */
+			/* 6GHz: Enable 802.11ax (required for 6GHz) */
 			fprintf(hostapd, "ieee80211n=1\n");
 			fprintf(hostapd, "ieee80211ac=1\n");
 			fprintf(hostapd, "ieee80211ax=1\n");
diff --git a/src/confd/yang/confd/infix-hardware.yang b/src/confd/yang/confd/infix-hardware.yang
index c4bce1ea..164f94e6 100644
--- a/src/confd/yang/confd/infix-hardware.yang
+++ b/src/confd/yang/confd/infix-hardware.yang
@@ -262,16 +262,15 @@ module infix-hardware {
            congestion in most environments.";
       }
 
-      leaf enable-wifi6 {
+      leaf enable-80211ax {
         type boolean;
-        default false;
         description
-          "Enable WiFi 6 (802.11ax) on 2.4GHz and 5GHz bands.
+          "Enable 802.11ax (WiFi 6) on 2.4GHz and 5GHz bands.
 
-           By default, WiFi 6 is enabled only on 6GHz (WiFi 6E).
-           Set to 'true' to enable WiFi 6 on 2.4GHz and 5GHz bands.
+           By default, 802.11ax is enabled only on 6GHz (WiFi 6E).
+           Set to 'true' to enable 802.11ax on 2.4GHz and 5GHz bands.
 
-           WiFi 6 provides:
+           802.11ax provides:
            - OFDMA (better multi-user efficiency)
            - Target Wake Time (better battery life)
            - 1024-QAM (higher throughput)
@@ -281,7 +280,7 @@ module infix-hardware {
            - Hardware support for 802.11ax
            - Compatible clients for full benefits
 
-           Note: 6GHz band always uses WiFi 6 regardless of this setting.";
+           Note: 6GHz band always uses 802.11ax regardless of this setting.";
       }
 
       /*