diff --git a/sys/arm64/arm64/gic_v3.c b/sys/arm64/arm64/gic_v3.c
index c0e939b1113..b74a56a9a4b 100644
--- a/sys/arm64/arm64/gic_v3.c
+++ b/sys/arm64/arm64/gic_v3.c
@@ -84,7 +84,7 @@ static device_method_t gic_v3_methods[] = {
 	DEVMETHOD_END
 };
 
-DEFINE_CLASS_0(gic_v3, gic_v3_driver, gic_v3_methods,
+DEFINE_CLASS_0(gic, gic_v3_driver, gic_v3_methods,
     sizeof(struct gic_v3_softc));
 
 /*
diff --git a/sys/arm64/arm64/gic_v3_fdt.c b/sys/arm64/arm64/gic_v3_fdt.c
index 10bc524cf58..79075f2a423 100644
--- a/sys/arm64/arm64/gic_v3_fdt.c
+++ b/sys/arm64/arm64/gic_v3_fdt.c
@@ -78,7 +78,7 @@ static device_method_t gic_v3_fdt_methods[] = {
 	DEVMETHOD_END
 };
 
-DEFINE_CLASS_1(gic_v3, gic_v3_fdt_driver, gic_v3_fdt_methods,
+DEFINE_CLASS_1(gic, gic_v3_fdt_driver, gic_v3_fdt_methods,
     sizeof(struct gic_v3_softc), gic_v3_driver);
 
 static devclass_t gic_v3_fdt_devclass;
@@ -287,12 +287,12 @@ static device_method_t gic_v3_its_fdt_methods[] = {
 	DEVMETHOD_END
 };
 
-DEFINE_CLASS_1(gic_v3_its, gic_v3_its_fdt_driver, gic_v3_its_fdt_methods,
+DEFINE_CLASS_1(its, gic_v3_its_fdt_driver, gic_v3_its_fdt_methods,
     sizeof(struct gic_v3_its_softc), gic_v3_its_driver);
 
 static devclass_t gic_v3_its_fdt_devclass;
 
-EARLY_DRIVER_MODULE(gic_v3_its, gic_v3, gic_v3_its_fdt_driver,
+EARLY_DRIVER_MODULE(its, gic, gic_v3_its_fdt_driver,
     gic_v3_its_fdt_devclass, 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE);
 
 static int
diff --git a/sys/arm64/arm64/gic_v3_its.c b/sys/arm64/arm64/gic_v3_its.c
index 1200f9c999e..7daeabe1348 100644
--- a/sys/arm64/arm64/gic_v3_its.c
+++ b/sys/arm64/arm64/gic_v3_its.c
@@ -82,7 +82,7 @@ static device_method_t gic_v3_its_methods[] = {
 	DEVMETHOD_END
 };
 
-DEFINE_CLASS_0(gic_v3_its, gic_v3_its_driver, gic_v3_its_methods,
+DEFINE_CLASS_0(its, gic_v3_its_driver, gic_v3_its_methods,
     sizeof(struct gic_v3_its_softc));
 
 MALLOC_DEFINE(M_GIC_V3_ITS, "GICv3 ITS", GIC_V3_ITS_DEVSTR);