diff --git a/sbin/ifconfig/ifbridge.c b/sbin/ifconfig/ifbridge.c
--- a/sbin/ifconfig/ifbridge.c
+++ b/sbin/ifconfig/ifbridge.c
@@ -256,8 +256,8 @@
 			else
 				printf(" <unknown state %d>", state);
 		}
-		if (member->ifbr_untagged != 0)
-			printf(" untagged %u", (unsigned)member->ifbr_untagged);
+		if (member->ifbr_pvid != 0)
+			printf(" untagged %u", (unsigned)member->ifbr_pvid);
 		print_vlans(&bridge->member_vlans[i]);
 		printf("\n");
 	}
@@ -632,11 +632,11 @@
 	memset(&req, 0, sizeof(req));
 	strlcpy(req.ifbr_ifsname, ifn, sizeof(req.ifbr_ifsname));
 
-	if (get_vlan_id(vlanid, &req.ifbr_untagged) < 0)
+	if (get_vlan_id(vlanid, &req.ifbr_pvid) < 0)
 		errx(1, "invalid VLAN identifier: %s", vlanid);
 
-	if (do_cmd(ctx, BRDGSIFUNTAGGED, &req, sizeof(req), 1) < 0)
-		err(1, "BRDGSIFUNTAGGED %s", vlanid);
+	if (do_cmd(ctx, BRDGSIFPVID, &req, sizeof(req), 1) < 0)
+		err(1, "BRDGSIFPVID %s", vlanid);
 }
 
 static void
@@ -647,10 +647,10 @@
 	memset(&req, 0, sizeof(req));
 
 	strlcpy(req.ifbr_ifsname, ifn, sizeof(req.ifbr_ifsname));
-	req.ifbr_untagged = 0;
+	req.ifbr_pvid = 0;
 
-	if (do_cmd(ctx, BRDGSIFUNTAGGED, &req, sizeof(req), 1) < 0)
-		err(1, "BRDGSIFUNTAGGED");
+	if (do_cmd(ctx, BRDGSIFPVID, &req, sizeof(req), 1) < 0)
+		err(1, "BRDGSIFPVID");
 }
 
 static void
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -257,8 +257,8 @@
 	uint32_t		bif_addrcnt;	/* cur. # of addresses */
 	uint32_t		bif_addrexceeded;/* # of address violations */
 	struct epoch_context	bif_epoch_ctx;
-	ether_vlanid_t		bif_untagged;	/* untagged vlan id */
-	ifbvlan_set_t		bif_vlan_set;	/* allowed tagged vlans */
+	ether_vlanid_t		bif_pvid;	/* port vlan id */
+	ifbvlan_set_t		bif_vlan_set;	/* if allowed tagged vlans */
 };
 
 /*
@@ -407,7 +407,7 @@
 static int	bridge_ioctl_sifprio(struct bridge_softc *, void *);
 static int	bridge_ioctl_sifcost(struct bridge_softc *, void *);
 static int	bridge_ioctl_sifmaxaddr(struct bridge_softc *, void *);
-static int	bridge_ioctl_sifuntagged(struct bridge_softc *, void *);
+static int	bridge_ioctl_sifpvid(struct bridge_softc *, void *);
 static int	bridge_ioctl_sifvlanset(struct bridge_softc *, void *);
 static int	bridge_ioctl_gifvlanset(struct bridge_softc *, void *);
 static int	bridge_ioctl_addspan(struct bridge_softc *, void *);
@@ -628,7 +628,7 @@
 	{ bridge_ioctl_sifmaxaddr,	sizeof(struct ifbreq),
 	  BC_F_COPYIN|BC_F_SUSER },
 
-	{ bridge_ioctl_sifuntagged,	sizeof(struct ifbreq),
+	{ bridge_ioctl_sifpvid,		sizeof(struct ifbreq),
 	  BC_F_COPYIN|BC_F_SUSER },
 
 	{ bridge_ioctl_sifvlanset,	sizeof(struct ifbif_vlan_req),
@@ -1533,7 +1533,7 @@
 	req->ifbr_addrcnt = bif->bif_addrcnt;
 	req->ifbr_addrmax = bif->bif_addrmax;
 	req->ifbr_addrexceeded = bif->bif_addrexceeded;
-	req->ifbr_untagged = bif->bif_untagged;
+	req->ifbr_pvid = bif->bif_pvid;
 
 	/* Copy STP state options as flags */
 	if (bp->bp_operedge)
@@ -1913,7 +1913,7 @@
 }
 
 static int
-bridge_ioctl_sifuntagged(struct bridge_softc *sc, void *arg)
+bridge_ioctl_sifpvid(struct bridge_softc *sc, void *arg)
 {
 	struct ifbreq *req = arg;
 	struct bridge_iflist *bif;
@@ -1922,12 +1922,12 @@
 	if (bif == NULL)
 		return (EXTERROR(ENOENT, "Interface is not a bridge member"));
 
-	if (req->ifbr_untagged > DOT1Q_VID_MAX)
+	if (req->ifbr_pvid > DOT1Q_VID_MAX)
 		return (EXTERROR(EINVAL, "Invalid VLAN ID"));
 
-	if (req->ifbr_untagged != DOT1Q_VID_NULL)
+	if (req->ifbr_pvid != DOT1Q_VID_NULL)
 		bif->bif_flags |= IFBIF_VLANFILTER;
-	bif->bif_untagged = req->ifbr_untagged;
+	bif->bif_pvid = req->ifbr_pvid;
 	return (0);
 }
 
@@ -2303,8 +2303,8 @@
 		 * the VLAN header.
 		 */
 		if ((bif->bif_flags & IFBIF_VLANFILTER) &&
-		    bif->bif_untagged != DOT1Q_VID_NULL &&
-		    VLANTAGOF(m) == bif->bif_untagged) {
+		    bif->bif_pvid != DOT1Q_VID_NULL &&
+		    VLANTAGOF(m) == bif->bif_pvid) {
 			m->m_flags &= ~M_VLANTAG;
 			m->m_pkthdr.ether_vtag = 0;
 		}
@@ -3170,14 +3170,14 @@
 		 * The frame doesn't have a tag.  If the interface does not
 		 * have an untagged vlan configured, drop the frame.
 		 */
-		if (sbif->bif_untagged == DOT1Q_VID_NULL)
+		if (sbif->bif_pvid == DOT1Q_VID_NULL)
 			return (false);
 
 		/*
 		 * Otherwise, insert a new tag based on the interface's
 		 * untagged vlan id.
 		 */
-		m->m_pkthdr.ether_vtag = sbif->bif_untagged;
+		m->m_pkthdr.ether_vtag = sbif->bif_pvid;
 		m->m_flags |= M_VLANTAG;
 	} else {
 		/*
@@ -3238,7 +3238,7 @@
 	 * If the frame's vlan matches the interfaces's untagged vlan,
 	 * allow it.
 	 */
-	if (vlan == dbif->bif_untagged)
+	if (vlan == dbif->bif_pvid)
 		return (true);
 
 	/*
diff --git a/sys/net/if_bridgevar.h b/sys/net/if_bridgevar.h
--- a/sys/net/if_bridgevar.h
+++ b/sys/net/if_bridgevar.h
@@ -124,7 +124,7 @@
 #define	BRDGSPROTO		28	/* set protocol (ifbrparam) */
 #define	BRDGSTXHC		29	/* set tx hold count (ifbrparam) */
 #define	BRDGSIFAMAX		30	/* set max interface addrs (ifbreq) */
-#define	BRDGSIFUNTAGGED		31	/* set if untagged vlan */
+#define	BRDGSIFPVID		31	/* set if PVID */
 #define	BRDGSIFVLANSET		32	/* set if vlan set */
 #define	BRDGGIFVLANSET		33	/* get if vlan set */
 
@@ -144,7 +144,7 @@
 	uint32_t	ifbr_addrcnt;		/* member if addr number */
 	uint32_t	ifbr_addrmax;		/* member if addr max */
 	uint32_t	ifbr_addrexceeded;	/* member if addr violations */
-	ether_vlanid_t	ifbr_untagged;		/* member if untagged vlan */
+	ether_vlanid_t	ifbr_pvid;		/* member if PVID */
 	uint8_t		pad[32];
 };