Index: lib/lib80211/lib80211_regdomain.c
===================================================================
--- lib/lib80211/lib80211_regdomain.c
+++ lib/lib80211/lib80211_regdomain.c
@@ -192,7 +192,7 @@
 		FLAG(IEEE80211_CHAN_VHT40),
 		FLAG(IEEE80211_CHAN_VHT80),
 		/*
-		 * XXX VHT80_80? This likely should be done by
+		 * XXX VHT80P80? This likely should be done by
 		 * 80MHz chan logic in net80211 / ifconfig.
 		 */
 		FLAG(IEEE80211_CHAN_VHT160),
Index: sbin/ifconfig/ifieee80211.c
===================================================================
--- sbin/ifconfig/ifieee80211.c
+++ sbin/ifconfig/ifieee80211.c
@@ -2168,7 +2168,7 @@
 			/*
 			 * VHT first - HT is a subset.
 			 *
-			 * XXX TODO: VHT80p80, VHT160 is not yet done.
+			 * XXX TODO: VHT80P80, VHT160 is not yet done.
 			 */
 			if (flags & IEEE80211_CHAN_VHT) {
 				if ((chanFlags & IEEE80211_CHAN_VHT20) &&
@@ -2378,7 +2378,7 @@
 				    &dc->dc_chaninfo);
 			}
 
-			/* XXX TODO: VHT80_80, VHT160 */
+			/* XXX TODO: VHT80P80, VHT160 */
 		}
 
 		if (!LIST_EMPTY(&rd->bands_11ng) && dc->dc_htcaps != 0) {
@@ -4006,7 +4006,7 @@
 {
 	if (IEEE80211_IS_CHAN_VHT160(c))
 		return 80;
-	if (IEEE80211_IS_CHAN_VHT80_80(c))
+	if (IEEE80211_IS_CHAN_VHT80P80(c))
 		return 75;
 	if (IEEE80211_IS_CHAN_VHT80(c))
 		return 70;
Index: sys/net80211/_ieee80211.h
===================================================================
--- sys/net80211/_ieee80211.h
+++ sys/net80211/_ieee80211.h
@@ -194,7 +194,7 @@
 #define	IEEE80211_CHAN_VHT40U	0x02000000 /* VHT40 channel, ext above */
 #define	IEEE80211_CHAN_VHT40D	0x04000000 /* VHT40 channel, ext below */
 #define	IEEE80211_CHAN_VHT80	0x08000000 /* VHT80 channel */
-#define	IEEE80211_CHAN_VHT80_80	0x10000000 /* VHT80+80 channel */
+#define	IEEE80211_CHAN_VHT80P80	0x10000000 /* VHT80+80 channel */
 #define	IEEE80211_CHAN_VHT160	0x20000000 /* VHT160 channel */
 /* XXX note: 0x80000000 is used in src/sbin/ifconfig/ifieee80211.c :( */
 
@@ -203,14 +203,14 @@
 
 #define	IEEE80211_CHAN_VHT40	(IEEE80211_CHAN_VHT40U | IEEE80211_CHAN_VHT40D)
 #define	IEEE80211_CHAN_VHT	(IEEE80211_CHAN_VHT20 | IEEE80211_CHAN_VHT40 \
-				| IEEE80211_CHAN_VHT80 | IEEE80211_CHAN_VHT80_80 \
+				| IEEE80211_CHAN_VHT80 | IEEE80211_CHAN_VHT80P80 \
 				| IEEE80211_CHAN_VHT160)
 
 #define	IEEE80211_CHAN_BITS \
 	"\20\1PRIV0\2PRIV2\3PRIV3\4PRIV4\5TURBO\6CCK\7OFDM\0102GHZ\0115GHZ" \
 	"\12PASSIVE\13DYN\14GFSK\15GSM\16STURBO\17HALF\20QUARTER\21HT20" \
 	"\22HT40U\23HT40D\24DFS\0254MSXMIT\26NOADHOC\27NOHOSTAP\03011D" \
-	"\031VHT20\032VHT40U\033VHT40D\034VHT80\035VHT80_80\036VHT160"
+	"\031VHT20\032VHT40U\033VHT40D\034VHT80\035VHT80P80\036VHT160"
 
 /*
  * Useful combinations of channel characteristics.
@@ -337,8 +337,8 @@
 	 ((_c)->ic_flags & IEEE80211_CHAN_VHT) != 0)
 #define	IEEE80211_IS_CHAN_VHT80(_c) \
 	(((_c)->ic_flags & IEEE80211_CHAN_VHT80) != 0)
-#define	IEEE80211_IS_CHAN_VHT80_80(_c) \
-	(((_c)->ic_flags & IEEE80211_CHAN_VHT80_80) != 0)
+#define	IEEE80211_IS_CHAN_VHT80P80(_c) \
+	(((_c)->ic_flags & IEEE80211_CHAN_VHT80P80) != 0)
 #define	IEEE80211_IS_CHAN_VHT160(_c) \
 	(((_c)->ic_flags & IEEE80211_CHAN_VHT160) != 0)
 
Index: sys/net80211/ieee80211_ht.c
===================================================================
--- sys/net80211/ieee80211_ht.c
+++ sys/net80211/ieee80211_ht.c
@@ -1957,7 +1957,7 @@
 		    (MS(vap->iv_vhtcaps,
 		     IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK) == 2) &&
 		    (vap->iv_flags_vht & IEEE80211_FVHT_USEVHT80P80)) {
-			vhtflags = IEEE80211_CHAN_VHT80_80;
+			vhtflags = IEEE80211_CHAN_VHT80P80;
 			/* Mirror the HT40 flags */
 			if (htflags == IEEE80211_CHAN_HT40U) {
 				vhtflags |= IEEE80211_CHAN_HT40U;
Index: sys/net80211/ieee80211_var.h
===================================================================
--- sys/net80211/ieee80211_var.h
+++ sys/net80211/ieee80211_var.h
@@ -922,7 +922,7 @@
 
 	if (IEEE80211_IS_CHAN_VHT160(c))
 		return IEEE80211_FVHT_USEVHT160;
-	if (IEEE80211_IS_CHAN_VHT80_80(c))
+	if (IEEE80211_IS_CHAN_VHT80P80(c))
 		return IEEE80211_FVHT_USEVHT80P80;
 	if (IEEE80211_IS_CHAN_VHT80(c))
 		return IEEE80211_FVHT_USEVHT80;
Index: sys/net80211/ieee80211_vht.c
===================================================================
--- sys/net80211/ieee80211_vht.c
+++ sys/net80211/ieee80211_vht.c
@@ -699,7 +699,7 @@
 	if (IEEE80211_IS_CHAN_VHT160(c)) {
 		return IEEE80211_VHT_CHANWIDTH_160MHZ;
 	}
-	if (IEEE80211_IS_CHAN_VHT80_80(c)) {
+	if (IEEE80211_IS_CHAN_VHT80P80(c)) {
 		return IEEE80211_VHT_CHANWIDTH_80P80MHZ;
 	}
 	if (IEEE80211_IS_CHAN_VHT80(c)) {
@@ -811,7 +811,7 @@
 		c = findvhtchan(ic, chan, IEEE80211_CHAN_VHT80);
 
 	if ((c == NULL) && (flags & IEEE80211_FVHT_USEVHT80P80))
-		c = findvhtchan(ic, chan, IEEE80211_CHAN_VHT80_80);
+		c = findvhtchan(ic, chan, IEEE80211_CHAN_VHT80P80);
 
 	if ((c == NULL) && (flags & IEEE80211_FVHT_USEVHT80))
 		c = findvhtchan(ic, chan, IEEE80211_CHAN_VHT80);