Rename helper functions for getting VM ID and vCPU index.

Change-Id: Ibdbdafdbf90f68c2fe86f103e09059b0607e3ad5
diff --git a/main.c b/main.c
index 2061005..f51c463 100644
--- a/main.c
+++ b/main.c
@@ -391,8 +391,8 @@
 
 		/* Wake up another vcpu. */
 		case HF_SPCI_RUN_WAKE_UP:
-			hf_handle_wake_up_request(wake_up_get_vm_id(ret),
-						  wake_up_get_vcpu(ret));
+			hf_handle_wake_up_request(spci_vm_id(ret),
+						  spci_vcpu_index(ret));
 			break;
 
 		/* Response available. */