diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/m25q_flash.c b/os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.c
similarity index 100%
rename from os/hal/lib/complex/serial_nor/devices/micron_n25q/m25q_flash.c
rename to os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.c
diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/m25q_flash.h b/os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.h
similarity index 100%
rename from os/hal/lib/complex/serial_nor/devices/micron_n25q/m25q_flash.h
rename to os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.h
diff --git a/os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.mk b/os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.mk
index 5a5e0ea49..143fec675 100644
--- a/os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.mk
+++ b/os/hal/lib/complex/serial_nor/devices/micron_n25q/micron_n25q.mk
@@ -1,8 +1,8 @@
 # List of all the Micron N25Q device files.
 M25QSRC := $(CHIBIOS)/os/hal/lib/peripherals/flash/hal_flash.c \
            $(CHIBIOS)/os/hal/lib/peripherals/flash/hal_jesd216_flash.c \
-           $(CHIBIOS)/os/hal/lib/complex/m25q/m25q.c \
-           $(CHIBIOS)/os/hal/lib/complex/m25q/devices/micron_n25q/m25q_flash.c
+           $(CHIBIOS)/os/hal/lib/complex/m25q/serial_nor.c \
+           $(CHIBIOS)/os/hal/lib/complex/m25q/devices/micron_n25q/micron_n25q.c
 
 # Required include directories
 M25QINC := $(CHIBIOS)/os/hal/lib/peripherals/flash \
diff --git a/os/hal/lib/complex/serial_nor/m25q.c b/os/hal/lib/complex/serial_nor/serial_nor.c
similarity index 100%
rename from os/hal/lib/complex/serial_nor/m25q.c
rename to os/hal/lib/complex/serial_nor/serial_nor.c
diff --git a/os/hal/lib/complex/serial_nor/m25q.h b/os/hal/lib/complex/serial_nor/serial_nor.h
similarity index 100%
rename from os/hal/lib/complex/serial_nor/m25q.h
rename to os/hal/lib/complex/serial_nor/serial_nor.h