diff --git a/tools/cert_create/src/main.c b/tools/cert_create/src/main.c
index de15ef6..6d11a27 100644
--- a/tools/cert_create/src/main.c
+++ b/tools/cert_create/src/main.c
@@ -91,16 +91,16 @@
 	BL32_ID,
 	BL33_ID,
 	/* Certificate file names (outputs) */
-	BL2_CERT_ID,
+	TRUSTED_BOOT_FW_CERT_ID,
 	TRUSTED_KEY_CERT_ID,
-	BL30_KEY_CERT_ID,
-	BL30_CERT_ID,
-	BL31_KEY_CERT_ID,
-	BL31_CERT_ID,
-	BL32_KEY_CERT_ID,
-	BL32_CERT_ID,
-	BL33_KEY_CERT_ID,
-	BL33_CERT_ID,
+	SCP_FW_KEY_CERT_ID,
+	SCP_FW_CONTENT_CERT_ID,
+	SOC_FW_KEY_CERT_ID,
+	SOC_FW_CONTENT_CERT_ID,
+	TRUSTED_OS_FW_KEY_CERT_ID,
+	TRUSTED_OS_FW_CONTENT_CERT_ID,
+	NON_TRUSTED_FW_KEY_CERT_ID,
+	NON_TRUSTED_FW_CONTENT_CERT_ID,
 	/* Key file names (input/output) */
 	ROT_KEY_ID,
 	TRUSTED_WORLD_KEY_ID,