diff --git a/docs/porting-guide.md b/docs/porting-guide.md
index 7b2e7d2..b4253e6 100644
--- a/docs/porting-guide.md
+++ b/docs/porting-guide.md
@@ -177,7 +177,7 @@
 
 The following mandatory modifications may be implemented in any file
 the implementer chooses. In the ARM FVP port, they are implemented in
-[../plat/fvp/aarch64/fvp_common.c].
+[../plat/fvp/aarch64/plat_common.c].
 
 *   **Variable : unsigned char platform_normal_stacks[X][Y]**
 
@@ -836,7 +836,7 @@
 the passed pointer with a pointer to BL3-1's private `plat_pm_ops` structure.
 
 A description of each member of this structure is given below. Please refer to
-the ARM FVP specific implementation of these handlers in [../plat/fvp/fvp_pm.c]
+the ARM FVP specific implementation of these handlers in [../plat/fvp/plat_pm.c]
 as an example. A platform port may choose not implement some of the power
 management operations. For example, the ARM FVP port does not implement the
 `affinst_standby()` function.
@@ -991,6 +991,6 @@
 
 [../plat/common/aarch64/platform_helpers.S]: ../plat/common/aarch64/platform_helpers.S
 [../plat/fvp/platform.h]:                    ../plat/fvp/platform.h
-[../plat/fvp/aarch64/fvp_common.c]:          ../plat/fvp/aarch64/fvp_common.c
-[../plat/fvp/fvp_pm.c]:                      ../plat/fvp/fvp_pm.c
+[../plat/fvp/aarch64/plat_common.c]:          ../plat/fvp/aarch64/plat_common.c
+[../plat/fvp/plat_pm.c]:                      ../plat/fvp/plat_pm.c
 [../include/runtime_svc.h]:                  ../include/runtime_svc.h
diff --git a/plat/fvp/aarch64/fvp_common.c b/plat/fvp/aarch64/plat_common.c
similarity index 100%
rename from plat/fvp/aarch64/fvp_common.c
rename to plat/fvp/aarch64/plat_common.c
diff --git a/plat/fvp/aarch64/fvp_helpers.S b/plat/fvp/aarch64/plat_helpers.S
similarity index 100%
rename from plat/fvp/aarch64/fvp_helpers.S
rename to plat/fvp/aarch64/plat_helpers.S
diff --git a/plat/fvp/fvp_gic.c b/plat/fvp/plat_gic.c
similarity index 100%
rename from plat/fvp/fvp_gic.c
rename to plat/fvp/plat_gic.c
diff --git a/plat/fvp/fvp_pm.c b/plat/fvp/plat_pm.c
similarity index 100%
rename from plat/fvp/fvp_pm.c
rename to plat/fvp/plat_pm.c
diff --git a/plat/fvp/fvp_topology.c b/plat/fvp/plat_topology.c
similarity index 100%
rename from plat/fvp/fvp_topology.c
rename to plat/fvp/plat_topology.c
diff --git a/plat/fvp/platform.mk b/plat/fvp/platform.mk
index 1765801..5da2acd 100644
--- a/plat/fvp/platform.mk
+++ b/plat/fvp/platform.mk
@@ -62,20 +62,20 @@
 
 BL1_OBJS		+=	bl1_plat_setup.o			\
 				bl1_plat_helpers.o			\
-				fvp_helpers.o				\
-				fvp_common.o				\
+				plat_helpers.o				\
+				plat_common.o				\
 				cci400.o
 
 BL2_OBJS		+=	bl2_plat_setup.o			\
-				fvp_common.o
+				plat_common.o
 
 BL31_OBJS		+=	bl31_plat_setup.o			\
-				fvp_helpers.o				\
-				fvp_common.o				\
-				fvp_pm.o				\
+				plat_helpers.o				\
+				plat_common.o				\
+				plat_pm.o				\
+				plat_topology.o				\
+				plat_gic.o				\
 				fvp_pwrc.o				\
-				fvp_topology.o				\
-				fvp_gic.o				\
 				cci400.o				\
 				gic_v2.o				\
 				gic_v3.o