diff --git a/sys/arm/allwinner/console.c b/sys/arm/allwinner/aw_console.c
similarity index 100%
rename from sys/arm/allwinner/console.c
rename to sys/arm/allwinner/aw_console.c
diff --git a/sys/arm/allwinner/files.allwinner b/sys/arm/allwinner/files.allwinner
index 2beeed1005a..a1cbaf66529 100644
--- a/sys/arm/allwinner/files.allwinner
+++ b/sys/arm/allwinner/files.allwinner
@@ -30,7 +30,7 @@ arm/allwinner/aw_sid.c			standard
 arm/allwinner/aw_thermal.c		standard
 dev/iicbus/sy8106a.c			optional	sy8106a
 arm/allwinner/aw_cir.c			optional	aw_cir evdev
-#arm/allwinner/console.c		standard
+#arm/allwinner/aw_console.c		standard
 
 arm/allwinner/a10_fb.c			optional	vt
 arm/allwinner/a10_hdmi.c		optional	hdmi
diff --git a/sys/arm/annapurna/alpine/common.c b/sys/arm/annapurna/alpine/alpine_common.c
similarity index 100%
rename from sys/arm/annapurna/alpine/common.c
rename to sys/arm/annapurna/alpine/alpine_common.c
diff --git a/sys/arm/annapurna/alpine/files.alpine b/sys/arm/annapurna/alpine/files.alpine
index 73ebfcf8a87..8bd33c3794d 100644
--- a/sys/arm/annapurna/alpine/files.alpine
+++ b/sys/arm/annapurna/alpine/files.alpine
@@ -5,6 +5,6 @@ kern/kern_clocksource.c				standard
 arm/versatile/sp804.c				standard
 dev/uart/uart_dev_ns8250.c			optional	uart
 
-arm/annapurna/alpine/common.c			standard
+arm/annapurna/alpine/alpine_common.c		standard
 arm/annapurna/alpine/alpine_machdep.c		standard
 arm/annapurna/alpine/alpine_machdep_mp.c	optional	smp
diff --git a/sys/arm/freescale/imx/files.imx5 b/sys/arm/freescale/imx/files.imx5
index c2214c188a1..31a7a62bb65 100644
--- a/sys/arm/freescale/imx/files.imx5
+++ b/sys/arm/freescale/imx/files.imx5
@@ -8,7 +8,7 @@ arm/freescale/imx/imx51_machdep.c	optional	soc_imx51
 arm/freescale/imx/imx53_machdep.c	optional	soc_imx53
 
 # Special serial console for debuging early boot code
-#arm/freescale/imx/console.c		standard
+#arm/freescale/imx/imx_console.c	standard
 
 # UART driver (includes serial console support)
 dev/uart/uart_dev_imx.c			optional uart
diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6
index 748e1c49abe..2141084eade 100644
--- a/sys/arm/freescale/imx/files.imx6
+++ b/sys/arm/freescale/imx/files.imx6
@@ -47,7 +47,7 @@ arm/freescale/imx/imx6_usbphy.c		optional ehci
 #
 # Low-level serial console for debugging early kernel startup.
 #
-#arm/freescale/imx/console.c  		standard
+#arm/freescale/imx/imx_console.c  	standard
 
 #
 # Not ready yet...
diff --git a/sys/arm/freescale/imx/console.c b/sys/arm/freescale/imx/imx_console.c
similarity index 100%
rename from sys/arm/freescale/imx/console.c
rename to sys/arm/freescale/imx/imx_console.c