diff --git a/src/mainboard/google/hatch/Kconfig b/src/mainboard/google/hatch/Kconfig
index 5f6ca70ec9..b2bcabb306 100644
--- a/src/mainboard/google/hatch/Kconfig
+++ b/src/mainboard/google/hatch/Kconfig
@@ -94,11 +94,11 @@ config FMDFILE
 	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos-hatch-32MiB.fmd" if BOARD_ROMSIZE_KB_32768
 endif
 
-if ROMSTAGE_SPD_SMBUS
+if BOARD_GOOGLE_BASEBOARD_PUFF
 config FMDFILE
 	string
-	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos-16MiB-spd.fmd" if BOARD_ROMSIZE_KB_16384
-	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos-spd.fmd" if BOARD_ROMSIZE_KB_32768
+	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos-puff-16MiB.fmd" if BOARD_ROMSIZE_KB_16384
+	default "src/mainboard/$(CONFIG_MAINBOARD_DIR)/chromeos-puff-32MiB.fmd" if BOARD_ROMSIZE_KB_32768
 endif
 
 config MAINBOARD_DIR
diff --git a/src/mainboard/google/hatch/chromeos-16MiB-spd.fmd b/src/mainboard/google/hatch/chromeos-puff-16MiB.fmd
similarity index 100%
rename from src/mainboard/google/hatch/chromeos-16MiB-spd.fmd
rename to src/mainboard/google/hatch/chromeos-puff-16MiB.fmd
diff --git a/src/mainboard/google/hatch/chromeos-spd.fmd b/src/mainboard/google/hatch/chromeos-puff-32MiB.fmd
similarity index 100%
rename from src/mainboard/google/hatch/chromeos-spd.fmd
rename to src/mainboard/google/hatch/chromeos-puff-32MiB.fmd