diff --git a/plat/juno/bl2_plat_setup.c b/plat/juno/bl2_plat_setup.c
index 4d162c6..957f7d4 100644
--- a/plat/juno/bl2_plat_setup.c
+++ b/plat/juno/bl2_plat_setup.c
@@ -63,7 +63,7 @@
 #define BL2_COHERENT_RAM_BASE (unsigned long)(&__COHERENT_RAM_START__)
 #define BL2_COHERENT_RAM_LIMIT (unsigned long)(&__COHERENT_RAM_END__)
 
-/* Pointer to memory visible to both BL2 and BL31 for passing data */
+/* Pointer to memory visible to both BL2 and BL3-1 for passing data */
 extern unsigned char **bl2_el_change_mem_ptr;
 
 /* Data structure which holds the extents of the trusted SRAM for BL2 */
@@ -106,21 +106,20 @@
 
 /*******************************************************************************
  * Perform platform specific setup. For now just initialize the memory location
- * to use for passing arguments to BL31.
+ * to use for passing arguments to BL3-1.
  ******************************************************************************/
 void bl2_platform_setup()
 {
 	/* Initialise the IO layer and register platform IO devices */
 	io_setup();
 
-	/* Populate the extents of memory available for loading BL33 */
+	/* Populate the extents of memory available for loading BL3-3 */
 	bl2_to_bl31_args.bl33_meminfo.total_base = DRAM_BASE;
 	bl2_to_bl31_args.bl33_meminfo.total_size = DRAM_SIZE;
 	bl2_to_bl31_args.bl33_meminfo.free_base = DRAM_BASE;
 	bl2_to_bl31_args.bl33_meminfo.free_size = DRAM_SIZE;
 	bl2_to_bl31_args.bl33_meminfo.attr = 0;
 	bl2_to_bl31_args.bl33_meminfo.next = 0;
-
 }
 
 /*******************************************************************************
diff --git a/plat/juno/bl31_plat_setup.c b/plat/juno/bl31_plat_setup.c
index fb29076..3d2137f 100644
--- a/plat/juno/bl31_plat_setup.c
+++ b/plat/juno/bl31_plat_setup.c
@@ -75,8 +75,8 @@
 
 /*******************************************************************************
  * Return a pointer to the 'el_change_info' structure of the next image for the
- * security state specified. BL33 corresponds to the non-secure image type
- * while BL32 corresponds to the secure image type. A NULL pointer is returned
+ * security state specified. BL3-3 corresponds to the non-secure image type
+ * while BL3-2 corresponds to the secure image type. A NULL pointer is returned
  * if the image does not exist.
  ******************************************************************************/
 el_change_info *bl31_get_next_image_info(uint32_t type)
@@ -95,7 +95,7 @@
 }
 
 /*******************************************************************************
- * Perform any BL31 specific platform actions. Here is an opportunity to copy
+ * Perform any BL3-1 specific platform actions. Here is an opportunity to copy
  * parameters passed by the calling EL (S-EL1 in BL2 & S-EL3 in BL1) before they
  * are lost (potentially). This needs to be done before the MMU is initialized
  * so that the memory layout can be used while creating page tables. On the FVP
diff --git a/plat/juno/platform.h b/plat/juno/platform.h
index 91dbecf..9265c2b 100644
--- a/plat/juno/platform.h
+++ b/plat/juno/platform.h
@@ -54,13 +54,13 @@
 /* Trusted Boot Firmware BL2 */
 #define BL2_IMAGE_NAME			"bl2.bin"
 
-/* EL3 Runtime Firmware BL31 */
+/* EL3 Runtime Firmware BL3-1 */
 #define BL31_IMAGE_NAME			"bl31.bin"
 
-/* Secure Payload BL32 (Trusted OS) */
+/* Secure Payload BL3-2 (Trusted OS) */
 #define BL32_IMAGE_NAME			"bl32.bin"
 
-/* Non-Trusted Firmware BL33 and its load address */
+/* Non-Trusted Firmware BL3-3 and its load address */
 #define BL33_IMAGE_NAME			"bl33.bin" /* e.g. UEFI */
 #define NS_IMAGE_OFFSET			(DRAM_BASE + 0x8000000) /* DRAM + 128MB */
 
@@ -145,7 +145,7 @@
 #define BL2_BASE			0x0402D000
 
 /*******************************************************************************
- * BL31 specific defines.
+ * BL3-1 specific defines.
  ******************************************************************************/
 #define BL31_BASE			0x0400C000