diff --git a/bl1/bl1_fwu.c b/bl1/bl1_fwu.c
index 0575921..5e8ee8e 100644
--- a/bl1/bl1_fwu.c
+++ b/bl1/bl1_fwu.c
@@ -64,7 +64,7 @@
 			unsigned int flags);
 static int bl1_fwu_sec_image_done(void **handle,
 			unsigned int flags);
-__dead2 static void bl1_fwu_done(void *cookie, void *reserved);
+__dead2 static void bl1_fwu_done(void *client_cookie, void *reserved);
 
 /*
  * This keeps track of last executed secure image id.
@@ -101,7 +101,7 @@
 		SMC_RET1(handle, bl1_fwu_sec_image_done(&handle, flags));
 
 	case FWU_SMC_UPDATE_DONE:
-		bl1_fwu_done(cookie, NULL);
+		bl1_fwu_done((void *)x1, NULL);
 		/* We should never return from bl1_fwu_done() */
 
 	default:
@@ -492,13 +492,13 @@
  * This function provides the opportunity for users to perform any
  * platform specific handling after the Firmware update is done.
  ******************************************************************************/
-__dead2 static void bl1_fwu_done(void *cookie, void *reserved)
+__dead2 static void bl1_fwu_done(void *client_cookie, void *reserved)
 {
 	NOTICE("BL1-FWU: *******FWU Process Completed*******\n");
 
 	/*
 	 * Call platform done function.
 	 */
-	bl1_plat_fwu_done(cookie, reserved);
+	bl1_plat_fwu_done(client_cookie, reserved);
 	assert(0);
 }
diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h
index c21f9ee..687c221 100644
--- a/include/plat/common/platform.h
+++ b/include/plat/common/platform.h
@@ -121,7 +121,7 @@
  * The following functions are used by firmware update
  * feature and may optionally be overridden.
  */
-__dead2 void bl1_plat_fwu_done(void *cookie, void *reserved);
+__dead2 void bl1_plat_fwu_done(void *client_cookie, void *reserved);
 
 
 /*******************************************************************************
diff --git a/plat/arm/board/juno/juno_bl1_setup.c b/plat/arm/board/juno/juno_bl1_setup.c
index 61a5738..e805c9a 100644
--- a/plat/arm/board/juno/juno_bl1_setup.c
+++ b/plat/arm/board/juno/juno_bl1_setup.c
@@ -72,7 +72,7 @@
 /*******************************************************************************
  * On Juno clear SYS_NVFLAGS and wait for watchdog reset.
  ******************************************************************************/
-__dead2 void bl1_plat_fwu_done(void *cookie, void *rsvd_ptr)
+__dead2 void bl1_plat_fwu_done(void *client_cookie, void *reserved)
 {
 	unsigned int *nv_flags_clr = (unsigned int *)
 			(V2M_SYSREGS_BASE + V2M_SYS_NVFLAGSCLR);
diff --git a/plat/common/plat_bl1_common.c b/plat/common/plat_bl1_common.c
index aee9440..e637aaf 100644
--- a/plat/common/plat_bl1_common.c
+++ b/plat/common/plat_bl1_common.c
@@ -69,7 +69,7 @@
 	return &bl2_img_desc;
 }
 
-__dead2 void bl1_plat_fwu_done(void *cookie, void *rsvd_ptr)
+__dead2 void bl1_plat_fwu_done(void *client_cookie, void *reserved)
 {
 	while (1)
 		wfi();