diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 1157f063d4..dbcdf8014e 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -16,7 +16,7 @@ config SOC_INTEL_GEMINILAKE
 	select PAGING_IN_CACHE_AS_RAM
 	select INTEL_CAR_NEM
 	help
-	  Intel GLK support
+	  Intel Geminilake support
 
 if SOC_INTEL_APOLLOLAKE
 
@@ -192,8 +192,8 @@ config VERSTAGE_ADDR
 	  The base address (in CAR) where verstage should be linked
 
 config FSP_HEADER_PATH
-	default "src/vendorcode/intel/fsp/fsp2_0/glk/2.2.0.0" if VENDOR_GOOGLE && SOC_INTEL_GEMINILAKE
-	default "src/vendorcode/intel/fsp/fsp2_0/glk/2.2.3.1" if SOC_INTEL_GEMINILAKE
+	default "src/vendorcode/intel/fsp/fsp2_0/geminilake/2.2.0.0" if VENDOR_GOOGLE && SOC_INTEL_GEMINILAKE
+	default "src/vendorcode/intel/fsp/fsp2_0/geminilake/2.2.3.1" if SOC_INTEL_GEMINILAKE
 	default "3rdparty/fsp/ApolloLakeFspBinPkg/Include/"
 
 config FSP_FD_PATH
diff --git a/src/vendorcode/intel/fsp/fsp2_0/glk/2.2.0.0/FspUpd.h b/src/vendorcode/intel/fsp/fsp2_0/geminilake/2.2.0.0/FspUpd.h
similarity index 100%
rename from src/vendorcode/intel/fsp/fsp2_0/glk/2.2.0.0/FspUpd.h
rename to src/vendorcode/intel/fsp/fsp2_0/geminilake/2.2.0.0/FspUpd.h
diff --git a/src/vendorcode/intel/fsp/fsp2_0/glk/2.2.0.0/FspmUpd.h b/src/vendorcode/intel/fsp/fsp2_0/geminilake/2.2.0.0/FspmUpd.h
similarity index 100%
rename from src/vendorcode/intel/fsp/fsp2_0/glk/2.2.0.0/FspmUpd.h
rename to src/vendorcode/intel/fsp/fsp2_0/geminilake/2.2.0.0/FspmUpd.h
diff --git a/src/vendorcode/intel/fsp/fsp2_0/glk/2.2.0.0/FspsUpd.h b/src/vendorcode/intel/fsp/fsp2_0/geminilake/2.2.0.0/FspsUpd.h
similarity index 100%
rename from src/vendorcode/intel/fsp/fsp2_0/glk/2.2.0.0/FspsUpd.h
rename to src/vendorcode/intel/fsp/fsp2_0/geminilake/2.2.0.0/FspsUpd.h
diff --git a/src/vendorcode/intel/fsp/fsp2_0/glk/2.2.3.1/FspUpd.h b/src/vendorcode/intel/fsp/fsp2_0/geminilake/2.2.3.1/FspUpd.h
similarity index 100%
rename from src/vendorcode/intel/fsp/fsp2_0/glk/2.2.3.1/FspUpd.h
rename to src/vendorcode/intel/fsp/fsp2_0/geminilake/2.2.3.1/FspUpd.h
diff --git a/src/vendorcode/intel/fsp/fsp2_0/glk/2.2.3.1/FspmUpd.h b/src/vendorcode/intel/fsp/fsp2_0/geminilake/2.2.3.1/FspmUpd.h
similarity index 100%
rename from src/vendorcode/intel/fsp/fsp2_0/glk/2.2.3.1/FspmUpd.h
rename to src/vendorcode/intel/fsp/fsp2_0/geminilake/2.2.3.1/FspmUpd.h
diff --git a/src/vendorcode/intel/fsp/fsp2_0/glk/2.2.3.1/FspsUpd.h b/src/vendorcode/intel/fsp/fsp2_0/geminilake/2.2.3.1/FspsUpd.h
similarity index 100%
rename from src/vendorcode/intel/fsp/fsp2_0/glk/2.2.3.1/FspsUpd.h
rename to src/vendorcode/intel/fsp/fsp2_0/geminilake/2.2.3.1/FspsUpd.h