diff --git a/services/std_svc/spm/spm.mk b/services/std_svc/spm/spm.mk
index b52292d6f..4ba9feb3c 100644
--- a/services/std_svc/spm/spm.mk
+++ b/services/std_svc/spm/spm.mk
@@ -16,11 +16,11 @@ include lib/sprt/sprt_host.mk
 SPM_SOURCES	:=	$(addprefix services/std_svc/spm/,	\
 			${ARCH}/spm_helpers.S			\
 			${ARCH}/spm_shim_exceptions.S		\
-			sp_setup.c				\
-			sp_xlat.c				\
 			spci.c					\
 			spm_buffers.c				\
 			spm_main.c				\
+			spm_setup.c				\
+			spm_xlat.c				\
 			sprt.c)					\
 			${SPRT_LIB_SOURCES}
 
diff --git a/services/std_svc/spm/sp_setup.c b/services/std_svc/spm/spm_setup.c
similarity index 100%
rename from services/std_svc/spm/sp_setup.c
rename to services/std_svc/spm/spm_setup.c
diff --git a/services/std_svc/spm/sp_xlat.c b/services/std_svc/spm/spm_xlat.c
similarity index 100%
rename from services/std_svc/spm/sp_xlat.c
rename to services/std_svc/spm/spm_xlat.c
diff --git a/services/std_svc/spm_deprecated/spm.mk b/services/std_svc/spm_deprecated/spm.mk
index fedcaed0f..ed36812f9 100644
--- a/services/std_svc/spm_deprecated/spm.mk
+++ b/services/std_svc/spm_deprecated/spm.mk
@@ -15,8 +15,8 @@ SPM_SOURCES	:=	$(addprefix services/std_svc/spm_deprecated/, \
 			${ARCH}/spm_helpers.S			\
 			${ARCH}/spm_shim_exceptions.S		\
 			spm_main.c				\
-			sp_setup.c				\
-			sp_xlat.c)
+			spm_setup.c				\
+			spm_xlat.c)
 
 
 # Let the top-level Makefile know that we intend to include a BL32 image
diff --git a/services/std_svc/spm_deprecated/sp_setup.c b/services/std_svc/spm_deprecated/spm_setup.c
similarity index 100%
rename from services/std_svc/spm_deprecated/sp_setup.c
rename to services/std_svc/spm_deprecated/spm_setup.c
diff --git a/services/std_svc/spm_deprecated/sp_xlat.c b/services/std_svc/spm_deprecated/spm_xlat.c
similarity index 100%
rename from services/std_svc/spm_deprecated/sp_xlat.c
rename to services/std_svc/spm_deprecated/spm_xlat.c