diff --git a/hypervisor/include/arch/x86/guest/guest_pm.h b/hypervisor/include/arch/x86/guest/pm.h
similarity index 89%
rename from hypervisor/include/arch/x86/guest/guest_pm.h
rename to hypervisor/include/arch/x86/guest/pm.h
index dc5e44068..9ba9f47bc 100644
--- a/hypervisor/include/arch/x86/guest/guest_pm.h
+++ b/hypervisor/include/arch/x86/guest/pm.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef GUEST_PM_H
-#define GUEST_PM_H
+#ifndef PM_H
+#define PM_H
 
 void vm_setup_cpu_state(struct vm *vm);
 int vm_load_pm_s_state(struct vm *vm);
diff --git a/hypervisor/include/arch/x86/hv_arch.h b/hypervisor/include/arch/x86/hv_arch.h
index cffdb6c25..263b0b4f9 100644
--- a/hypervisor/include/arch/x86/hv_arch.h
+++ b/hypervisor/include/arch/x86/hv_arch.h
@@ -18,7 +18,7 @@
 #include <mtrr.h>
 #include <vcpu.h>
 #include <trusty.h>
-#include <guest_pm.h>
+#include <pm.h>
 #include <vm.h>
 #include <cpuid.h>
 #include <mmu.h>