diff --git a/tools/fip_create/fip_create.c b/tools/fip_create/fip_create.c
index f0d0791..19afc74 100644
--- a/tools/fip_create/fip_create.c
+++ b/tools/fip_create/fip_create.c
@@ -56,23 +56,23 @@
 /* The images used depends on the platform. */
 static entry_lookup_list_t toc_entry_lookup_list[] = {
 	{ "SCP Firmware Updater Configuration FWU SCP_BL2U", UUID_TRUSTED_UPDATE_FIRMWARE_SCP_BL2U,
-	  "scp_bl2u", NULL, FLAG_FILENAME },
+	  "scp-fwu-cfg", NULL, FLAG_FILENAME },
 	{ "AP Firmware Updater Configuration BL2U", UUID_TRUSTED_UPDATE_FIRMWARE_BL2U,
-	  "bl2u", NULL, FLAG_FILENAME },
+	  "ap-fwu-cfg", NULL, FLAG_FILENAME },
 	{ "Firmware Updater NS_BL2U", UUID_TRUSTED_UPDATE_FIRMWARE_NS_BL2U,
-	  "ns_bl2u", NULL, FLAG_FILENAME },
+	  "fwu", NULL, FLAG_FILENAME },
 	{ "Non-Trusted Firmware Updater certificate", UUID_TRUSTED_FWU_CERT,
 	  "fwu-cert", NULL, FLAG_FILENAME},
 	{ "Trusted Boot Firmware BL2", UUID_TRUSTED_BOOT_FIRMWARE_BL2,
-	  "bl2", NULL, FLAG_FILENAME },
+	  "tb-fw", NULL, FLAG_FILENAME },
 	{ "SCP Firmware SCP_BL2", UUID_SCP_FIRMWARE_SCP_BL2,
-	  "scp_bl2", NULL, FLAG_FILENAME},
+	  "scp-fw", NULL, FLAG_FILENAME},
 	{ "EL3 Runtime Firmware BL31", UUID_EL3_RUNTIME_FIRMWARE_BL31,
-	  "bl31", NULL, FLAG_FILENAME},
+	  "soc-fw", NULL, FLAG_FILENAME},
 	{ "Secure Payload BL32 (Trusted OS)", UUID_SECURE_PAYLOAD_BL32,
-	  "bl32", NULL, FLAG_FILENAME},
+	  "tos-fw", NULL, FLAG_FILENAME},
 	{ "Non-Trusted Firmware BL33", UUID_NON_TRUSTED_FIRMWARE_BL33,
-	  "bl33", NULL, FLAG_FILENAME},
+	  "nt-fw", NULL, FLAG_FILENAME},
 	/* Key Certificates */
 	{ "Root Of Trust key certificate", UUID_ROT_KEY_CERT,
 	  "rot-cert", NULL, FLAG_FILENAME },