diff --git a/sys/dev/mii/icsphy.c b/sys/dev/mii/icsphy.c
index 420aa5a68e18..c756e581323f 100644
--- a/sys/dev/mii/icsphy.c
+++ b/sys/dev/mii/icsphy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: icsphy.c,v 1.19 2000/07/04 03:28:59 thorpej Exp $	*/
+/*	$NetBSD: icsphy.c,v 1.20 2001/03/28 14:16:49 drochner Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -111,8 +111,8 @@ icsphymatch(parent, match, aux)
 {
 	struct mii_attach_args *ma = aux;
 
-	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxICS &&
-	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxICS_1890)
+	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_ICS &&
+	    MII_MODEL(ma->mii_id2) == MII_MODEL_ICS_1890)
 		return (10);
 
 	return (0);
@@ -127,7 +127,7 @@ icsphyattach(parent, self, aux)
 	struct mii_attach_args *ma = aux;
 	struct mii_data *mii = ma->mii_data;
 
-	printf(": %s, rev. %d\n", MII_STR_xxICS_1890,
+	printf(": %s, rev. %d\n", MII_STR_ICS_1890,
 	    MII_REV(ma->mii_id2));
 
 	sc->mii_inst = mii->mii_instance;
diff --git a/sys/dev/mii/inphy.c b/sys/dev/mii/inphy.c
index a0cb9573c79b..250249934663 100644
--- a/sys/dev/mii/inphy.c
+++ b/sys/dev/mii/inphy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: inphy.c,v 1.20 2000/07/04 03:28:59 thorpej Exp $	*/
+/*	$NetBSD: inphy.c,v 1.21 2001/03/28 14:16:49 drochner Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -111,8 +111,8 @@ inphymatch(parent, match, aux)
 {
 	struct mii_attach_args *ma = aux;
 
-	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_INTEL &&
-	    MII_MODEL(ma->mii_id2) == MII_MODEL_INTEL_I82555)
+	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_yyINTEL &&
+	    MII_MODEL(ma->mii_id2) == MII_MODEL_yyINTEL_I82555)
 		return (10);
 
 	return (0);
@@ -127,7 +127,7 @@ inphyattach(parent, self, aux)
 	struct mii_attach_args *ma = aux;
 	struct mii_data *mii = ma->mii_data;
 
-	printf(": %s, rev. %d\n", MII_STR_INTEL_I82555,
+	printf(": %s, rev. %d\n", MII_STR_yyINTEL_I82555,
 	    MII_REV(ma->mii_id2));
 
 	sc->mii_inst = mii->mii_instance;
diff --git a/sys/dev/mii/iophy.c b/sys/dev/mii/iophy.c
index 7a201e9f8e65..697145c28f60 100644
--- a/sys/dev/mii/iophy.c
+++ b/sys/dev/mii/iophy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iophy.c,v 1.10 2000/07/04 03:28:59 thorpej Exp $	*/
+/*	$NetBSD: iophy.c,v 1.11 2001/03/28 14:16:49 drochner Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -113,8 +113,8 @@ iophymatch(parent, match, aux)
 	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxINTEL_I82553)
 		return (10);
 
-	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_INTEL &&
-	    MII_MODEL(ma->mii_id2) == MII_MODEL_INTEL_I82553)
+	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_yyINTEL &&
+	    MII_MODEL(ma->mii_id2) == MII_MODEL_yyINTEL_I82553)
 		return (10);
 
 	return (0);
@@ -129,7 +129,7 @@ iophyattach(parent, self, aux)
 	struct mii_attach_args *ma = aux;
 	struct mii_data *mii = ma->mii_data;
 
-	printf(": %s, rev. %d\n", MII_STR_INTEL_I82553,
+	printf(": %s, rev. %d\n", MII_STR_xxINTEL_I82553,
 	    MII_REV(ma->mii_id2));
 
 	sc->mii_inst = mii->mii_instance;
diff --git a/sys/dev/mii/nsphy.c b/sys/dev/mii/nsphy.c
index e35b492e4053..1b96619acb55 100644
--- a/sys/dev/mii/nsphy.c
+++ b/sys/dev/mii/nsphy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nsphy.c,v 1.28 2000/07/27 22:14:48 martin Exp $	*/
+/*	$NetBSD: nsphy.c,v 1.29 2001/03/28 14:16:49 drochner Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -111,8 +111,8 @@ nsphymatch(parent, match, aux)
 {
 	struct mii_attach_args *ma = aux;
 
-	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_NATSEMI &&
-	    MII_MODEL(ma->mii_id2) == MII_MODEL_NATSEMI_DP83840)
+	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxNATSEMI &&
+	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxNATSEMI_DP83840)
 		return (10);
 
 	return (0);
@@ -127,7 +127,7 @@ nsphyattach(parent, self, aux)
 	struct mii_attach_args *ma = aux;
 	struct mii_data *mii = ma->mii_data;
 
-	printf(": %s, rev. %d\n", MII_STR_NATSEMI_DP83840,
+	printf(": %s, rev. %d\n", MII_STR_xxNATSEMI_DP83840,
 	    MII_REV(ma->mii_id2));
 
 	sc->mii_inst = mii->mii_instance;
diff --git a/sys/dev/mii/nsphyter.c b/sys/dev/mii/nsphyter.c
index 820bc5e886d2..676141a76cf9 100644
--- a/sys/dev/mii/nsphyter.c
+++ b/sys/dev/mii/nsphyter.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: nsphyter.c,v 1.7 2000/07/04 03:28:59 thorpej Exp $	*/
+/*	$NetBSD: nsphyter.c,v 1.8 2001/03/28 14:16:49 drochner Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -111,8 +111,8 @@ nsphytermatch(parent, match, aux)
 {
 	struct mii_attach_args *ma = aux;
 
-	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_NATSEMI &&
-	    MII_MODEL(ma->mii_id2) == MII_MODEL_NATSEMI_DP83843)
+	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxNATSEMI &&
+	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxNATSEMI_DP83843)
 		return (10);
 
 	return (0);
@@ -127,7 +127,7 @@ nsphyterattach(parent, self, aux)
 	struct mii_attach_args *ma = aux;
 	struct mii_data *mii = ma->mii_data;
 
-	printf(": %s, rev. %d\n", MII_STR_NATSEMI_DP83843,
+	printf(": %s, rev. %d\n", MII_STR_xxNATSEMI_DP83843,
 	    MII_REV(ma->mii_id2));
 
 	sc->mii_inst = mii->mii_instance;
diff --git a/sys/dev/mii/qsphy.c b/sys/dev/mii/qsphy.c
index 7d8abef02a3e..398d73309005 100644
--- a/sys/dev/mii/qsphy.c
+++ b/sys/dev/mii/qsphy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: qsphy.c,v 1.21 2000/07/04 03:29:00 thorpej Exp $	*/
+/*	$NetBSD: qsphy.c,v 1.22 2001/03/28 14:16:49 drochner Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -111,8 +111,8 @@ qsphymatch(parent, match, aux)
 {
 	struct mii_attach_args *ma = aux;
 
-	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_QUALSEMI &&
-	    MII_MODEL(ma->mii_id2) == MII_MODEL_QUALSEMI_QS6612)
+	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxQUALSEMI &&
+	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxQUALSEMI_QS6612)
 		return (10);
 
 	return (0);
@@ -127,7 +127,7 @@ qsphyattach(parent, self, aux)
 	struct mii_attach_args *ma = aux;
 	struct mii_data *mii = ma->mii_data;
 
-	printf(": %s, rev. %d\n", MII_STR_QUALSEMI_QS6612,
+	printf(": %s, rev. %d\n", MII_STR_xxQUALSEMI_QS6612,
 	    MII_REV(ma->mii_id2));
 
 	sc->mii_inst = mii->mii_instance;
diff --git a/sys/dev/mii/sqphy.c b/sys/dev/mii/sqphy.c
index 428a1db4f2c7..f57c5dcacdf6 100644
--- a/sys/dev/mii/sqphy.c
+++ b/sys/dev/mii/sqphy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: sqphy.c,v 1.19 2000/07/04 03:29:00 thorpej Exp $	*/
+/*	$NetBSD: sqphy.c,v 1.20 2001/03/28 14:16:49 drochner Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -111,8 +111,8 @@ sqphymatch(parent, match, aux)
 {
 	struct mii_attach_args *ma = aux;
 
-	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxSEEQ &&
-	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxSEEQ_80220)
+	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_SEEQ &&
+	    MII_MODEL(ma->mii_id2) == MII_MODEL_SEEQ_80220)
 		return (10);
 
 	return (0);
@@ -127,7 +127,7 @@ sqphyattach(parent, self, aux)
 	struct mii_attach_args *ma = aux;
 	struct mii_data *mii = ma->mii_data;
 
-	printf(": %s, rev. %d\n", MII_STR_xxSEEQ_80220,
+	printf(": %s, rev. %d\n", MII_STR_SEEQ_80220,
 	    MII_REV(ma->mii_id2));
 
 	sc->mii_inst = mii->mii_instance;
diff --git a/sys/dev/mii/tlphy.c b/sys/dev/mii/tlphy.c
index d139d131787a..72aea1ddd921 100644
--- a/sys/dev/mii/tlphy.c
+++ b/sys/dev/mii/tlphy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tlphy.c,v 1.27 2000/10/11 22:03:33 sommerfeld Exp $	*/
+/*	$NetBSD: tlphy.c,v 1.28 2001/03/28 14:16:49 drochner Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -127,8 +127,8 @@ tlphymatch(parent, match, aux)
 {
 	struct mii_attach_args *ma = aux;       
 
-	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxTI &&
-	    MII_MODEL(ma->mii_id2) == MII_MODEL_xxTI_TLAN10T)
+	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_TI &&
+	    MII_MODEL(ma->mii_id2) == MII_MODEL_TI_TLAN10T)
 		return (10);
 
 	return (0);
@@ -145,7 +145,7 @@ tlphyattach(parent, self, aux)
 	struct mii_data *mii = ma->mii_data;
 	const char *sep = "";
 
-	printf(": %s, rev. %d\n", MII_STR_xxTI_TLAN10T,
+	printf(": %s, rev. %d\n", MII_STR_TI_TLAN10T,
 	    MII_REV(ma->mii_id2));
 
 	sc->sc_mii.mii_inst = mii->mii_instance;
diff --git a/sys/dev/mii/tqphy.c b/sys/dev/mii/tqphy.c
index 66196f3b41cf..96c3260b19b9 100644
--- a/sys/dev/mii/tqphy.c
+++ b/sys/dev/mii/tqphy.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tqphy.c,v 1.11 2000/07/04 03:29:00 thorpej Exp $	*/
+/*	$NetBSD: tqphy.c,v 1.12 2001/03/28 14:16:49 drochner Exp $	*/
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -111,9 +111,9 @@ tqphymatch(parent, match, aux)
 {
 	struct mii_attach_args *ma = aux;
 
-	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_TSC)
+	if (MII_OUI(ma->mii_id1, ma->mii_id2) == MII_OUI_xxTSC)
 		switch MII_MODEL(ma->mii_id2) {
-		case MII_MODEL_TSC_78Q2120:
+		case MII_MODEL_xxTSC_78Q2120:
 		/* case MII_MODEL_TSC_78Q2121: */
 			return (10);
 	}
@@ -130,7 +130,7 @@ tqphyattach(parent, self, aux)
 	struct mii_attach_args *ma = aux;
 	struct mii_data *mii = ma->mii_data;
 
-	printf(": %s, rev. %d\n", MII_STR_TSC_78Q2120,
+	printf(": %s, rev. %d\n", MII_STR_xxTSC_78Q2120,
 	    MII_REV(ma->mii_id2));
 
 	sc->mii_inst = mii->mii_instance;