diff --git a/main.c b/main.c
index 22082d9..6e859cf 100644
--- a/main.c
+++ b/main.c
@@ -405,12 +405,12 @@
 
 		/* Response available. */
 		case FFA_MSG_SEND_32:
-			if (ffa_msg_send_receiver(ret) == PRIMARY_VM_ID) {
+			if (ffa_receiver(ret) == PRIMARY_VM_ID) {
 				hf_handle_message(vcpu->vm,
 						  ffa_msg_send_size(ret),
 						  page_address(hf_recv_page));
 			} else {
-				hf_deliver_message(ffa_msg_send_receiver(ret));
+				hf_deliver_message(ffa_receiver(ret));
 			}
 			break;