diff --git a/src/mainboard/google/zork/bootblock.c b/src/mainboard/google/zork/bootblock.c
index 96cbe4d0ec..022a5e0904 100644
--- a/src/mainboard/google/zork/bootblock.c
+++ b/src/mainboard/google/zork/bootblock.c
@@ -12,5 +12,5 @@ void bootblock_mainboard_early_init(void)
 	gpios = variant_bootblock_gpio_table(&num_gpios, acpi_get_sleep_type());
 	gpio_configure_pads(gpios, num_gpios);
 
-	variant_pcie_gpio_configure();
+	baseboard_pcie_gpio_configure();
 }
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
index 6dc3595d63..70e456ccb5 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
@@ -248,7 +248,7 @@ static void wifi_power_reset_configure_pre_v3(void)
 	gpio_set(GPIO_42, 1);
 }
 
-__weak void variant_pcie_gpio_configure(void)
+void baseboard_pcie_gpio_configure(void)
 {
 	static const struct soc_amd_gpio pcie_gpio_table[] = {
 		/* PCIE_RST1_L - Variable timings (May remove) */
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
index 8d264c8476..455684e595 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
@@ -258,7 +258,7 @@ static void wifi_power_reset_configure_pre_v3(void)
 	gpio_set(GPIO_42, 1);
 }
 
-__weak void variant_pcie_gpio_configure(void)
+void baseboard_pcie_gpio_configure(void)
 {
 	static const struct soc_amd_gpio pcie_gpio_table[] = {
 		/* NVME_AUX_RESET_L */
diff --git a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
index 11926d102e..c76ca026ae 100644
--- a/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/zork/variants/baseboard/include/baseboard/variants.h
@@ -47,8 +47,8 @@ void variant_audio_update(void);
 void variant_bluetooth_update(void);
 /* Update touchscreen configuration in devicetree during ramstage. */
 void variant_touchscreen_update(void);
-/* Configure PCIe GPIOs as per variant sequencing requirements. */
-void variant_pcie_gpio_configure(void);
+/* Configure PCIe GPIOs as per baseboard sequencing requirements. */
+void baseboard_pcie_gpio_configure(void);
 
 /* Per variant FSP-S initialization, default implementation in baseboard and
  * overridable by the variant. */