diff --git a/src/drivers/tpm/Kconfig b/src/drivers/tpm/Kconfig
index d8a1e10b22..128f9bfecd 100644
--- a/src/drivers/tpm/Kconfig
+++ b/src/drivers/tpm/Kconfig
@@ -1,4 +1,4 @@
-config TPM_INIT
+config TPM_INIT_RAMSTAGE
 	bool
 	default y if TPM1 || TPM2
 	depends on !VBOOT && !VENDORCODE_ELTAN_VBOOT && !VENDORCODE_ELTAN_MBOOT
diff --git a/src/drivers/tpm/Makefile.inc b/src/drivers/tpm/Makefile.inc
index af6e5a21c1..9833eb4a2f 100644
--- a/src/drivers/tpm/Makefile.inc
+++ b/src/drivers/tpm/Makefile.inc
@@ -1,4 +1,4 @@
-ramstage-$(CONFIG_TPM_INIT) += tpm.c
+ramstage-$(CONFIG_TPM_INIT_RAMSTAGE) += tpm.c
 
 ifeq ($(CONFIG_TPM_PPI),y)
 ramstage-$(CONFIG_HAVE_ACPI_TABLES) += ppi.c
diff --git a/src/mainboard/facebook/fbg1701/Kconfig b/src/mainboard/facebook/fbg1701/Kconfig
index 1c4724741c..40cf8d91c3 100644
--- a/src/mainboard/facebook/fbg1701/Kconfig
+++ b/src/mainboard/facebook/fbg1701/Kconfig
@@ -87,7 +87,7 @@ config SPI_FLASH_WINBOND
 	bool
 	default y
 
-config TPM_INIT
+config TPM_INIT_RAMSTAGE
 	bool "TPM Setup in RAMSTAGE"
 	default n