diff --git a/include/common/firmware_image_package.h b/include/common/firmware_image_package.h
index daa043a..30c5502 100644
--- a/include/common/firmware_image_package.h
+++ b/include/common/firmware_image_package.h
@@ -64,24 +64,24 @@
 	{0x90e87e82, 0x60f8, 0x11e4, 0xa1, 0xb4, {0x77, 0x7a, 0x21, 0xb4, 0xf9, 0x4c} }
 #define UUID_NON_TRUSTED_WORLD_KEY_CERT \
 	{0x3d87671c, 0x635f, 0x11e4, 0x97, 0x8d, {0x27, 0xc0, 0xc7, 0x14, 0x8a, 0xbd} }
-#define UUID_SCP_FIRMWARE_BL30_KEY_CERT \
+#define UUID_SCP_FW_KEY_CERT \
 	{0xa1214202, 0x60f8, 0x11e4, 0x8d, 0x9b, {0xf3, 0x3c, 0x0e, 0x15, 0xa0, 0x14} }
-#define UUID_EL3_RUNTIME_FIRMWARE_BL31_KEY_CERT \
+#define UUID_SOC_FW_KEY_CERT \
 	{0xccbeb88a, 0x60f9, 0x11e4, 0x9a, 0xd0, {0xeb, 0x48, 0x22, 0xd8, 0xdc, 0xf8} }
-#define UUID_SECURE_PAYLOAD_BL32_KEY_CERT \
+#define UUID_TRUSTED_OS_FW_KEY_CERT \
 	{0x03d67794, 0x60fb, 0x11e4, 0x85, 0xdd, {0xb7, 0x10, 0x5b, 0x8c, 0xee, 0x04} }
-#define UUID_NON_TRUSTED_FIRMWARE_BL33_KEY_CERT \
+#define UUID_NON_TRUSTED_FW_KEY_CERT \
 	{0x2a83d58a, 0x60fb, 0x11e4, 0x8a, 0xaf, {0xdf, 0x30, 0xbb, 0xc4, 0x98, 0x59} }
 /* Content certificates */
-#define UUID_TRUSTED_BOOT_FIRMWARE_BL2_CERT \
+#define UUID_TRUSTED_BOOT_FW_CERT \
 	{0xea69e2d6, 0x635d, 0x11e4, 0x8d, 0x8c, {0x9f, 0xba, 0xbe, 0x99, 0x56, 0xa5} }
-#define UUID_SCP_FIRMWARE_BL30_CERT \
+#define UUID_SCP_FW_CONTENT_CERT \
 	{0x046fbe44, 0x635e, 0x11e4, 0xb2, 0x8b, {0x73, 0xd8, 0xea, 0xae, 0x96, 0x56} }
-#define UUID_EL3_RUNTIME_FIRMWARE_BL31_CERT \
+#define UUID_SOC_FW_CONTENT_CERT \
 	{0x200cb2e2, 0x635e, 0x11e4, 0x9c, 0xe8, {0xab, 0xcc, 0xf9, 0x2b, 0xb6, 0x66} }
-#define UUID_SECURE_PAYLOAD_BL32_CERT \
+#define UUID_TRUSTED_OS_FW_CONTENT_CERT \
 	{0x11449fa4, 0x635e, 0x11e4, 0x87, 0x28, {0x3f, 0x05, 0x72, 0x2a, 0xf3, 0x3d} }
-#define UUID_NON_TRUSTED_FIRMWARE_BL33_CERT \
+#define UUID_NON_TRUSTED_FW_CONTENT_CERT \
 	{0xf3c1c48e, 0x635d, 0x11e4, 0xa7, 0xa9, {0x87, 0xee, 0x40, 0xb2, 0x3f, 0xa7} }
 
 typedef struct fip_toc_header {
diff --git a/include/common/tbbr/tbbr_img_def.h b/include/common/tbbr/tbbr_img_def.h
index fabe0b9..8b16639 100644
--- a/include/common/tbbr/tbbr_img_def.h
+++ b/include/common/tbbr/tbbr_img_def.h
@@ -50,18 +50,18 @@
 #define BL33_IMAGE_ID			5
 
 /* Certificates */
-#define BL2_CERT_ID			6
+#define TRUSTED_BOOT_FW_CERT_ID		6
 #define TRUSTED_KEY_CERT_ID		7
 
-#define BL30_KEY_CERT_ID		8
-#define BL31_KEY_CERT_ID		9
-#define BL32_KEY_CERT_ID		10
-#define BL33_KEY_CERT_ID		11
+#define SCP_FW_KEY_CERT_ID		8
+#define SOC_FW_KEY_CERT_ID		9
+#define TRUSTED_OS_FW_KEY_CERT_ID	10
+#define NON_TRUSTED_FW_KEY_CERT_ID	11
 
-#define BL30_CERT_ID			12
-#define BL31_CERT_ID			13
-#define BL32_CERT_ID			14
-#define BL33_CERT_ID			15
+#define SCP_FW_CONTENT_CERT_ID		12
+#define SOC_FW_CONTENT_CERT_ID		13
+#define TRUSTED_OS_FW_CONTENT_CERT_ID	14
+#define NON_TRUSTED_FW_CONTENT_CERT_ID	15
 
 /* Non-Trusted ROM Firmware NS_BL1U */
 #define NS_BL1U_IMAGE_ID		16
diff --git a/include/plat/arm/board/common/board_arm_oid.h b/include/plat/arm/board/common/board_arm_oid.h
index b29212e..bf26a48 100644
--- a/include/plat/arm/board/common/board_arm_oid.h
+++ b/include/plat/arm/board/common/board_arm_oid.h
@@ -44,9 +44,9 @@
 
 
 /* TrustedFirmwareNVCounter - Non-volatile counter extension */
-#define TZ_FW_NVCOUNTER_OID			"1.3.6.1.4.1.4128.2100.1"
+#define TRUSTED_FW_NVCOUNTER_OID		"1.3.6.1.4.1.4128.2100.1"
 /* NonTrustedFirmwareNVCounter - Non-volatile counter extension */
-#define NTZ_FW_NVCOUNTER_OID			"1.3.6.1.4.1.4128.2100.2"
+#define NON_TRUSTED_FW_NVCOUNTER_OID		"1.3.6.1.4.1.4128.2100.2"
 
 
 /*
@@ -54,11 +54,11 @@
  */
 
 /* APFirmwareUpdaterConfigHash - BL2U */
-#define BL2U_HASH_OID				"1.3.6.1.4.1.4128.2100.101"
+#define AP_FWU_CFG_HASH_OID			"1.3.6.1.4.1.4128.2100.101"
 /* SCPFirmwareUpdaterConfigHash - SCP_BL2U */
-#define SCP_BL2U_HASH_OID			"1.3.6.1.4.1.4128.2100.102"
+#define SCP_FWU_CFG_HASH_OID			"1.3.6.1.4.1.4128.2100.102"
 /* FirmwareUpdaterHash - NS_BL2U */
-#define NS_BL2U_HASH_OID			"1.3.6.1.4.1.4128.2100.103"
+#define FWU_HASH_OID				"1.3.6.1.4.1.4128.2100.103"
 /* TrustedWatchdogRefreshTime */
 #define TRUSTED_WATCHDOG_TIME_OID		"1.3.6.1.4.1.4128.2100.104"
 
@@ -68,7 +68,7 @@
  */
 
 /* TrustedBootFirmwareHash - BL2 */
-#define BL2_HASH_OID				"1.3.6.1.4.1.4128.2100.201"
+#define TRUSTED_BOOT_FW_HASH_OID		"1.3.6.1.4.1.4128.2100.201"
 
 
 /*
@@ -78,9 +78,9 @@
 /* PrimaryDebugCertificatePK */
 #define PRIMARY_DEBUG_PK_OID			"1.3.6.1.4.1.4128.2100.301"
 /* TrustedWorldPK */
-#define TZ_WORLD_PK_OID				"1.3.6.1.4.1.4128.2100.302"
+#define TRUSTED_WORLD_PK_OID			"1.3.6.1.4.1.4128.2100.302"
 /* NonTrustedWorldPK */
-#define NTZ_WORLD_PK_OID			"1.3.6.1.4.1.4128.2100.303"
+#define NON_TRUSTED_WORLD_PK_OID		"1.3.6.1.4.1.4128.2100.303"
 
 
 /*
@@ -100,7 +100,7 @@
  */
 
 /* SoCFirmwareContentCertPK */
-#define BL31_CONTENT_CERT_PK_OID		"1.3.6.1.4.1.4128.2100.501"
+#define SOC_FW_CONTENT_CERT_PK_OID		"1.3.6.1.4.1.4128.2100.501"
 
 
 /*
@@ -112,7 +112,7 @@
 /* SoCConfigHash */
 #define SOC_CONFIG_HASH_OID			"1.3.6.1.4.1.4128.2100.602"
 /* SoCAPFirmwareHash - BL31 */
-#define BL31_HASH_OID				"1.3.6.1.4.1.4128.2100.603"
+#define SOC_AP_FW_HASH_OID			"1.3.6.1.4.1.4128.2100.603"
 
 
 /*
@@ -120,7 +120,7 @@
  */
 
 /* SCPFirmwareContentCertPK */
-#define BL30_CONTENT_CERT_PK_OID		"1.3.6.1.4.1.4128.2100.701"
+#define SCP_FW_CONTENT_CERT_PK_OID		"1.3.6.1.4.1.4128.2100.701"
 
 
 /*
@@ -128,7 +128,7 @@
  */
 
 /* SCPFirmwareHash - BL30 */
-#define BL30_HASH_OID				"1.3.6.1.4.1.4128.2100.801"
+#define SCP_FW_HASH_OID				"1.3.6.1.4.1.4128.2100.801"
 /* SCPRomPatchHash - BL0_PATCH */
 #define SCP_ROM_PATCH_HASH_OID			"1.3.6.1.4.1.4128.2100.802"
 
@@ -138,7 +138,7 @@
  */
 
 /* TrustedOSFirmwareContentCertPK */
-#define BL32_CONTENT_CERT_PK_OID		"1.3.6.1.4.1.4128.2100.901"
+#define TRUSTED_OS_FW_CONTENT_CERT_PK_OID	"1.3.6.1.4.1.4128.2100.901"
 
 
 /*
@@ -146,7 +146,7 @@
  */
 
 /* TrustedOSFirmwareHash - BL32 */
-#define BL32_HASH_OID				"1.3.6.1.4.1.4128.2100.1001"
+#define TRUSTED_OS_FW_HASH_OID			"1.3.6.1.4.1.4128.2100.1001"
 
 
 /*
@@ -154,7 +154,7 @@
  */
 
 /* NonTrustedFirmwareContentCertPK */
-#define BL33_CONTENT_CERT_PK_OID		"1.3.6.1.4.1.4128.2100.1101"
+#define NON_TRUSTED_FW_CONTENT_CERT_PK_OID	"1.3.6.1.4.1.4128.2100.1101"
 
 
 /*
@@ -162,6 +162,6 @@
  */
 
 /* NonTrustedWorldBootloaderHash - BL33 */
-#define BL33_HASH_OID				"1.3.6.1.4.1.4128.2100.1201"
+#define NON_TRUSTED_WORLD_BOOTLOADER_HASH_OID	"1.3.6.1.4.1.4128.2100.1201"
 
 #endif /* __BOARD_ARM_OID_H__ */