diff --git a/hypervisor/include/arch/x86/asm/guest/ept.h b/hypervisor/include/arch/x86/asm/guest/ept.h
index 1d2b37c19..0ddea00ad 100644
--- a/hypervisor/include/arch/x86/asm/guest/ept.h
+++ b/hypervisor/include/arch/x86/asm/guest/ept.h
@@ -25,13 +25,13 @@ struct acrn_vm;
  * @brief Check if the GPA range is guest valid GPA or not
  *
  * @param[in] vm the pointer that points to VM data structure
- * @param[in] base The specified start guest physical address of guest
- *                physical memory region
+ * @param[in] mr_base_gpa The specified start guest physical address of guest
+ *                        physical memory region
  * @param[in] size The size of guest physical memory region
  *
  * @retval true if the GPA range is guest valid GPA, false otherwise.
  */
-bool ept_is_valid_mr(struct acrn_vm *vm, uint64_t base, uint64_t size);
+bool ept_is_valid_mr(struct acrn_vm *vm, uint64_t mr_base_gpa, uint64_t size);
 
 /**
  * @brief EPT page tables destroy
diff --git a/hypervisor/include/common/timer.h b/hypervisor/include/common/timer.h
index a4807f04b..50ed71d69 100644
--- a/hypervisor/include/common/timer.h
+++ b/hypervisor/include/common/timer.h
@@ -54,7 +54,7 @@ struct hv_timer {
  * @param[in] timer Pointer to timer.
  * @param[in] func irq callback if time reached.
  * @param[in] priv_data func private data.
- * @param[in] fire_tsc tsc deadline to interrupt.
+ * @param[in] timeout tsc deadline to interrupt.
  * @param[in] period_in_cycle period of the periodic timer in unit of TSC cycles.
  *
  * @remark Don't initialize a timer twice if it has been added to the timer list
@@ -64,7 +64,7 @@ struct hv_timer {
  */
 void initialize_timer(struct hv_timer *timer,
 		      timer_handle_t func, void *priv_data,
-		      uint64_t fire_tsc, uint64_t period_in_cycle);
+		      uint64_t timeout, uint64_t period_in_cycle);
 
 /**
  * @brief Check a timer whether expired.