diff --git a/plat/imx/imx8mq/imx8m_bl31_setup.c b/plat/imx/imx8mq/imx8mq_bl31_setup.c
similarity index 100%
rename from plat/imx/imx8mq/imx8m_bl31_setup.c
rename to plat/imx/imx8mq/imx8mq_bl31_setup.c
diff --git a/plat/imx/imx8mq/imx8m_psci.c b/plat/imx/imx8mq/imx8mq_psci.c
similarity index 100%
rename from plat/imx/imx8mq/imx8m_psci.c
rename to plat/imx/imx8mq/imx8mq_psci.c
diff --git a/plat/imx/imx8mq/platform.mk b/plat/imx/imx8mq/platform.mk
index 5b5926d..6090bb5 100644
--- a/plat/imx/imx8mq/platform.mk
+++ b/plat/imx/imx8mq/platform.mk
@@ -15,13 +15,13 @@
 
 BL31_SOURCES		+=	plat/imx/common/imx8_helpers.S		\
 				plat/imx/common/mxcuart_console.S	\
-				plat/imx/imx8mq/imx8m_bl31_setup.c	\
+				plat/imx/imx8mq/imx8mq_bl31_setup.c	\
 				plat/imx/imx8mq/src.c			\
 				plat/imx/imx8mq/hab.c			\
 				plat/imx/imx8mq/gpc.c			\
-				plat/imx/imx8mq/imx8m_psci.c		\
 				plat/imx/common/imx8_sip_svc.c		\
 				plat/imx/common/misc.c			\
+				plat/imx/imx8mq/imx8mq_psci.c		\
 				plat/imx/imx8mq/imx_csu.c		\
 				plat/imx/imx8mq/imx_rdc.c		\
 				plat/imx/common/imx8_topology.c		\