8 files changed, 10 insertions, 10 deletions
diff --git a/src/drivers/intel/fsp2_0/ppi/Kconfig b/src/drivers/intel/fsp2_0/ppi/Kconfig
index 7cbc87f7ab..d45114681e 100644
--- a/src/drivers/intel/fsp2_0/ppi/Kconfig
+++ b/src/drivers/intel/fsp2_0/ppi/Kconfig
@@ -14,7 +14,7 @@ config MP_SERVICES_PPI_V1
 	select MP_SERVICES_PPI
 	help
 	  This option provides EFI_PEI_MP_SERVICES_PPI structure definitions
-	  along with all APIs as per EDK2 specification.
+	  along with all APIs as per edk2 specification.
 
 config MP_SERVICES_PPI_V2
 	bool
@@ -22,7 +22,7 @@ config MP_SERVICES_PPI_V2
 	select MP_SERVICES_PPI
 	help
 	  This option provides EDKII_PEI_MP_SERVICES2_PPI structure definitions
-	  along with all APIs as per EDK2 specification. MP services2 PPI is slight
+	  along with all APIs as per edk2 specification. MP services2 PPI is slight
 	  modification over MP services1 PPIs. A new API StartupAllCPUs have been
 	  added to allow running a task on BSP and all APs. Also the EFI_PEI_SERVICES
 	  parameter has been removed from all MP PPI APIs.
diff --git a/src/drivers/intel/fsp2_0/ppi/mp_service1.c b/src/drivers/intel/fsp2_0/ppi/mp_service1.c
index bbc78a0c75..879a8e881a 100644
--- a/src/drivers/intel/fsp2_0/ppi/mp_service1.c
+++ b/src/drivers/intel/fsp2_0/ppi/mp_service1.c
@@ -58,7 +58,7 @@ static efi_return_status_t mps1_identify_processor(const
 	return mp_identify_processor(processor_number);
 }
 
-/* EDK2 UEFIPKG Open Source MP Service PPI to be installed */
+/* edk2 UEFIPKG Open Source MP Service PPI to be installed */
 
 static efi_pei_mp_services_ppi mp_service1_ppi = {
 	mps1_get_number_of_processors,
diff --git a/src/drivers/intel/fsp2_0/ppi/mp_service2.c b/src/drivers/intel/fsp2_0/ppi/mp_service2.c
index c7d4764e29..fd91b46d4a 100644
--- a/src/drivers/intel/fsp2_0/ppi/mp_service2.c
+++ b/src/drivers/intel/fsp2_0/ppi/mp_service2.c
@@ -67,7 +67,7 @@ static efi_return_status_t mps2_identify_processor(
 	return mp_identify_processor(processor_number);
 }
 
-/* EDK2 UEFIPKG Open Source MP Services 2 PPI to be installed */
+/* edk2 UEFIPKG Open Source MP Services 2 PPI to be installed */
 
 static efi_pei_mp_services_ppi mp_service2_ppi = {
 	mps2_get_number_of_processors,
diff --git a/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c b/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c
index 53d91822b8..66bbc2f085 100644
--- a/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c
+++ b/src/drivers/intel/fsp2_0/ppi/mp_service_ppi.c
@@ -96,7 +96,7 @@ efi_return_status_t mp_startup_all_cpus(efi_ap_procedure procedure,
 	/*
 	 * Run on APs Serially
 	 *
-	 * FIXME: As per MP service specification, EDK2 is allowed to specify the mode
+	 * FIXME: As per MP service specification, edk2 is allowed to specify the mode
 	 * in which a 'func' routine should be executed on APs (i.e. execute serially
 	 * or concurrently).
 	 *
diff --git a/src/drivers/intel/fsp2_0/util.c b/src/drivers/intel/fsp2_0/util.c
index 629f331f29..1dedb6587f 100644
--- a/src/drivers/intel/fsp2_0/util.c
+++ b/src/drivers/intel/fsp2_0/util.c
@@ -33,7 +33,7 @@ static bool looks_like_fsp_header(struct fsp_header *hdr)
 		return false;
 	}
 
-	/* It is possible to build FSP with any version of EDK2 which could have introduced new
+	/* It is possible to build FSP with any version of edk2 which could have introduced new
 	   fields in FSP_INFO_HEADER. The new fields will be ignored based on the reported FSP
 	   version. This check ensures that the reported header length is at least what the
 	   reported FSP version requires so that we do not access any out-of-bound bytes. */
diff --git a/src/drivers/smmstore/Kconfig b/src/drivers/smmstore/Kconfig
index 93b3f00262..62aa3aaca8 100644
--- a/src/drivers/smmstore/Kconfig
+++ b/src/drivers/smmstore/Kconfig
@@ -3,13 +3,13 @@
 config SMMSTORE
 	bool "Support for flash based, SMM mediated data store"
 	depends on BOOT_DEVICE_SUPPORTS_WRITES && HAVE_SMI_HANDLER
-	default y if PAYLOAD_TIANOCORE
+	default y if PAYLOAD_EDK2
 	select SPI_FLASH_SMM if BOOT_DEVICE_SPI_FLASH_RW_NOMMAP
 
 config SMMSTORE_V2
 	bool "Use version 2 of SMMSTORE API"
 	depends on SMMSTORE
-	default y if PAYLOAD_TIANOCORE
+	default y if PAYLOAD_EDK2
 	default n
 	help
 	  Version 2 of SMMSTORE allows secure communication with SMM and
diff --git a/src/drivers/smmstore/store.c b/src/drivers/smmstore/store.c
index 482a045abf..96cb761e40 100644
--- a/src/drivers/smmstore/store.c
+++ b/src/drivers/smmstore/store.c
@@ -311,7 +311,7 @@ int smmstore_get_info(struct smmstore_params_info *out)
 	out->block_size = SMM_BLOCK_SIZE;
 	out->num_blocks = region_device_sz(&store) / SMM_BLOCK_SIZE;
 
-	/* FIXME: Broken EDK2 always assumes memory mapped Firmware Block Volumes */
+	/* FIXME: Broken edk2 always assumes memory mapped Firmware Block Volumes */
 	out->mmap_addr = (uintptr_t)rdev_mmap_full(&store);
 
 	printk(BIOS_DEBUG, "smm store: %d # blocks with size 0x%x\n",
diff --git a/src/drivers/tpm/Kconfig b/src/drivers/tpm/Kconfig
index 735cfeebb8..c3538cf395 100644
--- a/src/drivers/tpm/Kconfig
+++ b/src/drivers/tpm/Kconfig
@@ -12,7 +12,7 @@ config TPM_PPI
 	depends on TPM
 	depends on HAVE_ACPI_TABLES
 	depends on !CHROMEOS
-	default y if PAYLOAD_TIANOCORE
+	default y if PAYLOAD_EDK2
 	help
 	  This driver automatically generates ACPI tables for the Physical
 	  Presence Interface defined by the TCG. If not activated only a stub