diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b995cc1366e..9c202380485 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -90,7 +90,7 @@ config X86_NO_MELTDOWN
 	  This hidden option should be set on a per-SOC basis to indicate that
 	  a particular SOC is not vulnerable to the Meltdown CPU vulnerability.
 
-config X86_NO_SPECTRE
+config X86_NO_SPECTRE_V2
 	bool
 	default y
 	help
diff --git a/kernel/Kconfig b/kernel/Kconfig
index 18ff7af6e83..0a89922180c 100644
--- a/kernel/Kconfig
+++ b/kernel/Kconfig
@@ -556,7 +556,7 @@ menu "Security Options"
 config RETPOLINE
 	bool
 	prompt "Build with retpolines enabled"
-	default y if !X86_NO_SPECTRE
+	default y if !X86_NO_SPECTRE_V2
 	help
 	  This is recommended on platforms with speculative executions, to protect
 	  against branch target injection (AKA Spectre-V2).  Full description of