diff --git a/spm/cactus/cactus_tests/cactus_message_loop.c b/spm/cactus/cactus_tests/cactus_message_loop.c
index 2cd54c1..01ea32f 100644
--- a/spm/cactus/cactus_tests/cactus_message_loop.c
+++ b/spm/cactus/cactus_tests/cactus_message_loop.c
@@ -28,8 +28,8 @@
 
 #define PRINT_CMD(smc_ret)						\
 	VERBOSE("cmd %lx; args: %lx, %lx, %lx, %lx\n",	 		\
-		smc_ret.ret3, smc_ret.ret4, smc_ret.ret5, 		\
-		smc_ret.ret6, smc_ret.ret7)
+		smc_ret.arg3, smc_ret.arg4, smc_ret.arg5, 		\
+		smc_ret.arg6, smc_ret.arg7)
 
 /**
  * Traverses command table from section ".cactus_handler", searches for a
diff --git a/spm/ivy/app/ivy_main.c b/spm/ivy/app/ivy_main.c
index 30d2f37..0098809 100644
--- a/spm/ivy/app/ivy_main.c
+++ b/spm/ivy/app/ivy_main.c
@@ -57,7 +57,7 @@
 			goto init;
 		}
 
-		VERBOSE("Received request: %lx\n", ret.ret3);
+		VERBOSE("Received request: %lx\n", ret.arg3);
 
 		ret = ffa_msg_send_direct_resp32(my_id, ffa_dir_msg_source(ret),
 						 0, 0, 0, 0, 0);