diff --git a/sys/arm/at91/at91_spi.c b/sys/arm/at91/at91_spi.c
index 53c33807ee5f..2252f00c8d25 100644
--- a/sys/arm/at91/at91_spi.c
+++ b/sys/arm/at91/at91_spi.c
@@ -297,7 +297,7 @@ static device_method_t at91_spi_methods[] = {
 };
 
 static driver_t at91_spi_driver = {
-	"at91_spi",
+	"spi",
 	at91_spi_methods,
 	sizeof(struct at91_spi_softc),
 };
diff --git a/sys/dev/spibus/spibus.c b/sys/dev/spibus/spibus.c
index 76b4a8cc3c72..33205ea64f1d 100644
--- a/sys/dev/spibus/spibus.c
+++ b/sys/dev/spibus/spibus.c
@@ -194,5 +194,5 @@ static driver_t spibus_driver = {
 
 devclass_t	spibus_devclass;
 
-DRIVER_MODULE(spibus, at91_spi, spibus_driver, spibus_devclass, 0, 0);
+DRIVER_MODULE(spibus, spi, spibus_driver, spibus_devclass, 0, 0);
 MODULE_VERSION(spibus, 1);