diff --git a/sys/conf/files b/sys/conf/files
index 08ab51ffc19..cc907c50db1 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -2526,7 +2526,7 @@ dev/vt/font/vt_font_default.c	optional vt
 dev/vt/font/vt_mouse_cursor.c	optional vt
 dev/vt/hw/efifb/efifb.c		optional vt_efifb
 dev/vt/hw/fb/vt_fb.c		optional vt
-dev/vt/hw/vga/vga.c		optional vt vt_vga
+dev/vt/hw/vga/vt_vga.c		optional vt vt_vga
 dev/vt/logo/logo_freebsd.c	optional vt splash
 dev/vt/vt_buf.c			optional vt
 dev/vt/vt_consolectl.c		optional vt
diff --git a/sys/dev/vt/hw/vga/vga.c b/sys/dev/vt/hw/vga/vt_vga.c
similarity index 99%
rename from sys/dev/vt/hw/vga/vga.c
rename to sys/dev/vt/hw/vga/vt_vga.c
index a13e094a107..15bed12c804 100644
--- a/sys/dev/vt/hw/vga/vga.c
+++ b/sys/dev/vt/hw/vga/vt_vga.c
@@ -38,7 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 
 #include <dev/vt/vt.h>
-#include <dev/vt/hw/vga/vga_reg.h>
+#include <dev/vt/hw/vga/vt_vga_reg.h>
 
 #include <machine/bus.h>
 
diff --git a/sys/dev/vt/hw/vga/vga_reg.h b/sys/dev/vt/hw/vga/vt_vga_reg.h
similarity index 100%
rename from sys/dev/vt/hw/vga/vga_reg.h
rename to sys/dev/vt/hw/vga/vt_vga_reg.h