diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index 0e9005a80657..9d67f91357a3 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -201,7 +201,7 @@ static device_method_t sf_methods[] = {
 };
 
 static driver_t sf_driver = {
-	"if_sf",
+	"sf",
 	sf_methods,
 	sizeof(struct sf_softc),
 };
diff --git a/sys/dev/sk/if_sk.c b/sys/dev/sk/if_sk.c
index 9e06a35f1851..04c1bf72fe09 100644
--- a/sys/dev/sk/if_sk.c
+++ b/sys/dev/sk/if_sk.c
@@ -174,7 +174,7 @@ static device_method_t sk_methods[] = {
 };
 
 static driver_t sk_driver = {
-	"if_skc",
+	"skc",
 	sk_methods,
 	sizeof(struct sk_softc)
 };
diff --git a/sys/dev/ti/if_ti.c b/sys/dev/ti/if_ti.c
index 22d342068e34..947f6c1c26ee 100644
--- a/sys/dev/ti/if_ti.c
+++ b/sys/dev/ti/if_ti.c
@@ -217,7 +217,7 @@ static device_method_t ti_methods[] = {
 };
 
 static driver_t ti_driver = {
-	"if_ti",
+	"ti",
 	ti_methods,
 	sizeof(struct ti_softc)
 };
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index a4a22d83a250..23f9ca90e8a0 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -195,7 +195,7 @@ static device_method_t vr_methods[] = {
 };
 
 static driver_t vr_driver = {
-	"if_vr",
+	"vr",
 	vr_methods,
 	sizeof(struct vr_softc)
 };
diff --git a/sys/pci/if_ax.c b/sys/pci/if_ax.c
index 6b26641e6a5c..0cb2daf788a3 100644
--- a/sys/pci/if_ax.c
+++ b/sys/pci/if_ax.c
@@ -190,7 +190,7 @@ static device_method_t ax_methods[] = {
 };
 
 static driver_t ax_driver = {
-	"if_ax",
+	"ax",
 	ax_methods,
 	sizeof(struct ax_softc)
 };
diff --git a/sys/pci/if_dm.c b/sys/pci/if_dm.c
index 157663a25dfe..356eafd5f94e 100644
--- a/sys/pci/if_dm.c
+++ b/sys/pci/if_dm.c
@@ -183,7 +183,7 @@ static device_method_t dm_methods[] = {
 };
 
 static driver_t dm_driver = {
-	"if_dm",
+	"dm",
 	dm_methods,
 	sizeof(struct dm_softc)
 };
diff --git a/sys/pci/if_mx.c b/sys/pci/if_mx.c
index b27f6ce2752b..739ff3bd1d43 100644
--- a/sys/pci/if_mx.c
+++ b/sys/pci/if_mx.c
@@ -208,7 +208,7 @@ static device_method_t mx_methods[] = {
 };
 
 static driver_t mx_driver = {
-	"if_mx",
+	"mx",
 	mx_methods,
 	sizeof(struct mx_softc)
 };
diff --git a/sys/pci/if_pn.c b/sys/pci/if_pn.c
index 42c3f9a9bc18..8483cc98c5eb 100644
--- a/sys/pci/if_pn.c
+++ b/sys/pci/if_pn.c
@@ -200,7 +200,7 @@ static device_method_t pn_methods[] = {
 };
 
 static driver_t pn_driver = {
-	"if_pn",
+	"pn",
 	pn_methods,
 	sizeof(struct pn_softc),
 };
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index 8547e9387b05..c7bf0b478abc 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -221,7 +221,7 @@ static device_method_t rl_methods[] = {
 };
 
 static driver_t rl_driver = {
-	"if_rl",
+	"rl",
 	rl_methods,
 	sizeof(struct rl_softc)
 };
diff --git a/sys/pci/if_sf.c b/sys/pci/if_sf.c
index 0e9005a80657..9d67f91357a3 100644
--- a/sys/pci/if_sf.c
+++ b/sys/pci/if_sf.c
@@ -201,7 +201,7 @@ static device_method_t sf_methods[] = {
 };
 
 static driver_t sf_driver = {
-	"if_sf",
+	"sf",
 	sf_methods,
 	sizeof(struct sf_softc),
 };
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index f9e50dee6b34..419c176719c1 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -178,7 +178,7 @@ static device_method_t sis_methods[] = {
 };
 
 static driver_t sis_driver = {
-	"if_sis",
+	"sis",
 	sis_methods,
 	sizeof(struct sis_softc)
 };
diff --git a/sys/pci/if_sk.c b/sys/pci/if_sk.c
index 9e06a35f1851..04c1bf72fe09 100644
--- a/sys/pci/if_sk.c
+++ b/sys/pci/if_sk.c
@@ -174,7 +174,7 @@ static device_method_t sk_methods[] = {
 };
 
 static driver_t sk_driver = {
-	"if_skc",
+	"skc",
 	sk_methods,
 	sizeof(struct sk_softc)
 };
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 3f6c6864795f..2d6d31eb215a 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -165,7 +165,7 @@ static device_method_t ste_methods[] = {
 };
 
 static driver_t ste_driver = {
-	"if_ste",
+	"ste",
 	ste_methods,
 	sizeof(struct ste_softc)
 };
diff --git a/sys/pci/if_ti.c b/sys/pci/if_ti.c
index 22d342068e34..947f6c1c26ee 100644
--- a/sys/pci/if_ti.c
+++ b/sys/pci/if_ti.c
@@ -217,7 +217,7 @@ static device_method_t ti_methods[] = {
 };
 
 static driver_t ti_driver = {
-	"if_ti",
+	"ti",
 	ti_methods,
 	sizeof(struct ti_softc)
 };
diff --git a/sys/pci/if_tl.c b/sys/pci/if_tl.c
index a593cd345035..f848d0a3deb9 100644
--- a/sys/pci/if_tl.c
+++ b/sys/pci/if_tl.c
@@ -354,7 +354,7 @@ static device_method_t tl_methods[] = {
 };
 
 static driver_t tl_driver = {
-	"if_tl",
+	"tl",
 	tl_methods,
 	sizeof(struct tl_softc)
 };
diff --git a/sys/pci/if_vr.c b/sys/pci/if_vr.c
index a4a22d83a250..23f9ca90e8a0 100644
--- a/sys/pci/if_vr.c
+++ b/sys/pci/if_vr.c
@@ -195,7 +195,7 @@ static device_method_t vr_methods[] = {
 };
 
 static driver_t vr_driver = {
-	"if_vr",
+	"vr",
 	vr_methods,
 	sizeof(struct vr_softc)
 };
diff --git a/sys/pci/if_wb.c b/sys/pci/if_wb.c
index f309006e2383..f5770bd3776e 100644
--- a/sys/pci/if_wb.c
+++ b/sys/pci/if_wb.c
@@ -222,7 +222,7 @@ static device_method_t wb_methods[] = {
 };
 
 static driver_t wb_driver = {
-	"if_wb",
+	"wb",
 	wb_methods,
 	sizeof(struct wb_softc)
 };
diff --git a/sys/pci/if_xl.c b/sys/pci/if_xl.c
index e6bce9f6f465..7358dd8b8329 100644
--- a/sys/pci/if_xl.c
+++ b/sys/pci/if_xl.c
@@ -277,7 +277,7 @@ static device_method_t xl_methods[] = {
 };
 
 static driver_t xl_driver = {
-	"if_xl",
+	"xl",
 	xl_methods,
 	sizeof(struct xl_softc)
 };