diff --git a/src/arch/x86/include/arch/null_breakpoint.h b/src/arch/x86/include/arch/null_breakpoint.h
index 9d69d3c0e4..030ebee86e 100644
--- a/src/arch/x86/include/arch/null_breakpoint.h
+++ b/src/arch/x86/include/arch/null_breakpoint.h
@@ -7,13 +7,13 @@
 
 /* Places data and instructions breakpoints at address zero. */
 void null_breakpoint_init(void);
-void null_breakpoint_disable(void);
+void null_breakpoint_remove(void);
 #else
 static inline void null_breakpoint_init(void)
 {
 	/* Not implemented */
 }
-static inline void null_breakpoint_disable(void)
+static inline void null_breakpoint_remove(void)
 {
 	/* Not implemented */
 }
diff --git a/src/arch/x86/include/arch/stack_canary_breakpoint.h b/src/arch/x86/include/arch/stack_canary_breakpoint.h
index 98c79222e4..01ab5e2d37 100644
--- a/src/arch/x86/include/arch/stack_canary_breakpoint.h
+++ b/src/arch/x86/include/arch/stack_canary_breakpoint.h
@@ -7,13 +7,13 @@
 
 /* Places a data breakpoint at stack canary. */
 void stack_canary_breakpoint_init(void);
-void stack_canary_breakpoint_disable(void);
+void stack_canary_breakpoint_remove(void);
 #else
 static inline void stack_canary_breakpoint_init(void)
 {
 	/* Not implemented */
 }
-static inline void stack_canary_breakpoint_disable(void)
+static inline void stack_canary_breakpoint_remove(void)
 {
 	/* Not implemented */
 }
diff --git a/src/arch/x86/null_breakpoint.c b/src/arch/x86/null_breakpoint.c
index 44c7ae91c4..e07566f1ec 100644
--- a/src/arch/x86/null_breakpoint.c
+++ b/src/arch/x86/null_breakpoint.c
@@ -58,16 +58,16 @@ void null_breakpoint_init(void)
 	create_instruction_breakpoint();
 }
 
-void null_breakpoint_disable(void)
+void null_breakpoint_remove(void)
 {
 	breakpoint_remove(null_fetch_bp);
 	breakpoint_remove(null_deref_bp);
 }
 
-static void null_breakpoint_disable_hook(void *unused)
+static void null_breakpoint_remove_hook(void *unused)
 {
-	null_breakpoint_disable();
+	null_breakpoint_remove();
 }
 
-BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, null_breakpoint_disable_hook, NULL);
-BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY, null_breakpoint_disable_hook, NULL);
+BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, null_breakpoint_remove_hook, NULL);
+BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY, null_breakpoint_remove_hook, NULL);
diff --git a/src/arch/x86/stack_canary_breakpoint.c b/src/arch/x86/stack_canary_breakpoint.c
index 6db8d63e40..d1dc3c3658 100644
--- a/src/arch/x86/stack_canary_breakpoint.c
+++ b/src/arch/x86/stack_canary_breakpoint.c
@@ -49,15 +49,15 @@ void stack_canary_breakpoint_init(void)
 	create_stack_canary_breakpoint(addr);
 }
 
-void stack_canary_breakpoint_disable(void)
+void stack_canary_breakpoint_remove(void)
 {
 	breakpoint_remove(stack_canary_bp);
 }
 
-static void stack_canary_breakpoint_disable_hook(void *unused)
+static void stack_canary_breakpoint_remove_hook(void *unused)
 {
-	stack_canary_breakpoint_disable();
+	stack_canary_breakpoint_remove();
 }
 
-BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, stack_canary_breakpoint_disable_hook, NULL);
-BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY, stack_canary_breakpoint_disable_hook, NULL);
+BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY, stack_canary_breakpoint_remove_hook, NULL);
+BOOT_STATE_INIT_ENTRY(BS_PAYLOAD_BOOT, BS_ON_ENTRY, stack_canary_breakpoint_remove_hook, NULL);
diff --git a/src/device/oprom/realmode/x86.c b/src/device/oprom/realmode/x86.c
index c3adf401f4..15dd8b589b 100644
--- a/src/device/oprom/realmode/x86.c
+++ b/src/device/oprom/realmode/x86.c
@@ -181,7 +181,7 @@ static void setup_realmode_idt(void)
 
 	/* It's expected that we write to the NULL page in the first two iterations of the
 	   following loop, so temporarily disable the NULL breakpoint. */
-	null_breakpoint_disable();
+	null_breakpoint_remove();
 
 	/* Copy IDT stub code for each interrupt. This might seem wasteful
 	 * but it is really simple
diff --git a/src/drivers/intel/fsp2_0/memory_init.c b/src/drivers/intel/fsp2_0/memory_init.c
index 39d7ce9e27..ce0d2831e3 100644
--- a/src/drivers/intel/fsp2_0/memory_init.c
+++ b/src/drivers/intel/fsp2_0/memory_init.c
@@ -412,8 +412,8 @@ static void do_fsp_memory_init(const struct fspm_context *context, bool s3wake)
 	fsp_debug_before_memory_init(fsp_raminit, upd, &fspm_upd);
 
 	/* FSP disables the interrupt handler so remove debug exceptions temporarily  */
-	null_breakpoint_disable();
-	stack_canary_breakpoint_disable();
+	null_breakpoint_remove();
+	stack_canary_breakpoint_remove();
 	post_code(POSTCODE_FSP_MEMORY_INIT);
 	timestamp_add_now(TS_FSP_MEMORY_INIT_START);
 	if (ENV_X86_64 && CONFIG(PLATFORM_USES_FSP2_X86_32))
diff --git a/src/drivers/intel/fsp2_0/notify.c b/src/drivers/intel/fsp2_0/notify.c
index 3ec78d595a..358589d549 100644
--- a/src/drivers/intel/fsp2_0/notify.c
+++ b/src/drivers/intel/fsp2_0/notify.c
@@ -78,8 +78,8 @@ static void fsp_notify(enum fsp_notify_phase phase)
 	post_code(data->post_code_before);
 
 	/* FSP disables the interrupt handler so remove debug exceptions temporarily  */
-	null_breakpoint_disable();
-	stack_canary_breakpoint_disable();
+	null_breakpoint_remove();
+	stack_canary_breakpoint_remove();
 	if (ENV_X86_64 && CONFIG(PLATFORM_USES_FSP2_X86_32))
 		ret = protected_mode_call_1arg(fspnotify, (uintptr_t)&notify_params);
 	else
diff --git a/src/drivers/intel/fsp2_0/silicon_init.c b/src/drivers/intel/fsp2_0/silicon_init.c
index 1e1ff99924..1caf00ff73 100644
--- a/src/drivers/intel/fsp2_0/silicon_init.c
+++ b/src/drivers/intel/fsp2_0/silicon_init.c
@@ -132,8 +132,8 @@ static void do_silicon_init(struct fsp_header *hdr)
 	post_code(POSTCODE_FSP_SILICON_INIT);
 
 	/* FSP disables the interrupt handler so remove debug exceptions temporarily  */
-	null_breakpoint_disable();
-	stack_canary_breakpoint_disable();
+	null_breakpoint_remove();
+	stack_canary_breakpoint_remove();
 	if (ENV_X86_64 && CONFIG(PLATFORM_USES_FSP2_X86_32))
 		status = protected_mode_call_1arg(silicon_init, (uintptr_t)upd);
 	else