diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 5863640b24..382aaef96e 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -137,7 +137,7 @@ config VGA_BIOS_ID
 
 config VGA_BIOS_FILE
 	string
-	default "3rdparty/blobs/soc/amd/stoneyridge/VBIOS.bin"
+	default "3rdparty/blobs/soc/amd/picasso/VBIOS.bin"
 
 config S3_VGA_ROM_RUN
 	bool
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index f38f8ad1f2..bb24c67b05 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -109,9 +109,9 @@ smm-$(CONFIG_DEBUG_SMI) += uart.c
 smm-$(CONFIG_SPI_FLASH) += spi.c
 smm-y += gpio.c
 
-CPPFLAGS_common += -I$(src)/soc/amd/stoneyridge
-CPPFLAGS_common += -I$(src)/soc/amd/stoneyridge/include
-CPPFLAGS_common += -I$(src)/soc/amd/stoneyridge/acpi
+CPPFLAGS_common += -I$(src)/soc/amd/picasso
+CPPFLAGS_common += -I$(src)/soc/amd/picasso/include
+CPPFLAGS_common += -I$(src)/soc/amd/picasso/acpi
 
 # ROMSIG Normally At ROMBASE + 0x20000
 # Overridden by CONFIG_AMD_FWM_POSITION_INDEX
diff --git a/src/soc/amd/picasso/acpi/globalnvs.asl b/src/soc/amd/picasso/acpi/globalnvs.asl
index 03d205f8d3..e780a642c6 100644
--- a/src/soc/amd/picasso/acpi/globalnvs.asl
+++ b/src/soc/amd/picasso/acpi/globalnvs.asl
@@ -17,7 +17,7 @@
 
 /*
  * NOTE: The layout of the GNVS structure below must match the layout in
- * soc/amd/stoneyridge/include/soc/nvs.h !!!
+ * soc/amd/picasso/include/soc/nvs.h !!!
  *
  */
 
diff --git a/src/soc/amd/picasso/include/soc/nvs.h b/src/soc/amd/picasso/include/soc/nvs.h
index 8ce5da623a..5023df6b27 100644
--- a/src/soc/amd/picasso/include/soc/nvs.h
+++ b/src/soc/amd/picasso/include/soc/nvs.h
@@ -17,7 +17,7 @@
 
 /*
  * NOTE: The layout of the global_nvs_t structure below must match the layout
- * in soc/soc/amd/stoneyridge/acpi/globalnvs.asl !!!
+ * in soc/soc/amd/picasso/acpi/globalnvs.asl !!!
  *
  */