diff --git a/hypervisor/arch/x86/trampoline.S b/hypervisor/arch/x86/trampoline.S
index f119c462d..027ac2649 100644
--- a/hypervisor/arch/x86/trampoline.S
+++ b/hypervisor/arch/x86/trampoline.S
@@ -100,7 +100,7 @@ trampoline_fixup_target:
 
     /* Set CR3 to PML4 table address */
 
-    movl    $CPU_Boot_Page_Tables_ptr, %ebx
+    movl    $cpu_boot_page_tables_ptr, %ebx
     mov     (%ebx), %eax
     mov     %eax, %cr3
 
@@ -195,14 +195,14 @@ trampoline_gdt_ptr:
 
 /* PML4, PDPT, and PD tables initialized to map first 4 GBytes of memory */
     .align  4
-    .global CPU_Boot_Page_Tables_ptr
-CPU_Boot_Page_Tables_ptr:
-    .long CPU_Boot_Page_Tables_Start
+    .global cpu_boot_page_tables_ptr
+cpu_boot_page_tables_ptr:
+    .long cpu_boot_page_tables_start
 
     /*0x1000 = CPU_PAGE_SIZE*/
     .align  0x1000
-    .global CPU_Boot_Page_Tables_Start
-CPU_Boot_Page_Tables_Start:
+    .global cpu_boot_page_tables_start
+cpu_boot_page_tables_start:
     /* 0x3 = (PAGE_PRESENT | PAGE_RW) */
     .quad   trampoline_pdpt_addr + 0x3
     /*0x1000 = CPU_PAGE_SIZE*/
diff --git a/hypervisor/boot/include/reloc.h b/hypervisor/boot/include/reloc.h
index 47f400934..e34fbebdd 100644
--- a/hypervisor/boot/include/reloc.h
+++ b/hypervisor/boot/include/reloc.h
@@ -26,8 +26,8 @@ extern uint8_t		cpu_primary_start_64;
 extern uint8_t		trampoline_fixup_cs;
 extern uint8_t		trampoline_fixup_ip;
 extern uint8_t		trampoline_fixup_target;
-extern uint8_t		CPU_Boot_Page_Tables_Start;
-extern uint8_t		CPU_Boot_Page_Tables_ptr;
+extern uint8_t		cpu_boot_page_tables_start;
+extern uint8_t		cpu_boot_page_tables_ptr;
 extern uint8_t		trampoline_pdpt_addr;
 extern uint8_t		trampoline_gdt_ptr;
 extern uint8_t		trampoline_start64_fixup;
diff --git a/hypervisor/boot/reloc.c b/hypervisor/boot/reloc.c
index ae0313219..269b7761f 100644
--- a/hypervisor/boot/reloc.c
+++ b/hypervisor/boot/reloc.c
@@ -182,12 +182,10 @@ static void update_trampoline_code_refs(uint64_t dest_pa)
 	*(uint16_t *)(ptr) = (uint16_t)(val & 0xfU);
 
 	/* Update temporary page tables */
-	ptr = hpa2hva(dest_pa +
-			trampoline_relo_addr(&CPU_Boot_Page_Tables_ptr));
+	ptr = hpa2hva(dest_pa + trampoline_relo_addr(&cpu_boot_page_tables_ptr));
 	*(uint32_t *)(ptr) += (uint32_t)dest_pa;
 
-	ptr = hpa2hva(dest_pa +
-			trampoline_relo_addr(&CPU_Boot_Page_Tables_Start));
+	ptr = hpa2hva(dest_pa + trampoline_relo_addr(&cpu_boot_page_tables_start));
 	*(uint64_t *)(ptr) += dest_pa;
 
 	ptr = hpa2hva(dest_pa + trampoline_relo_addr(&trampoline_pdpt_addr));