diff --git a/src/mainboard/intel/Kconfig b/src/mainboard/intel/Kconfig
index 9426242314..fff6594759 100644
--- a/src/mainboard/intel/Kconfig
+++ b/src/mainboard/intel/Kconfig
@@ -19,8 +19,8 @@ config BOARD_INTEL_TRUXTON
 	bool "EP80579 devkit (Truxton)"
 config BOARD_INTEL_XE7501DEVKIT
 	bool "XE7501devkit"
-config BOARD_INTEL_GRAYSREEF
-	bool "Grays Reef CRB"
+config BOARD_INTEL_BASKING_RIDGE
+	bool "Basking Ridge CRB"
 
 endchoice
 
@@ -28,7 +28,7 @@ source "src/mainboard/intel/d810e2cb/Kconfig"
 source "src/mainboard/intel/d945gclf/Kconfig"
 source "src/mainboard/intel/eagleheights/Kconfig"
 source "src/mainboard/intel/emeraldlake2/Kconfig"
-source "src/mainboard/intel/graysreef/Kconfig"
+source "src/mainboard/intel/baskingridge/Kconfig"
 source "src/mainboard/intel/jarrell/Kconfig"
 source "src/mainboard/intel/mtarvon/Kconfig"
 source "src/mainboard/intel/truxton/Kconfig"
diff --git a/src/mainboard/intel/graysreef/Kconfig b/src/mainboard/intel/baskingridge/Kconfig
similarity index 85%
rename from src/mainboard/intel/graysreef/Kconfig
rename to src/mainboard/intel/baskingridge/Kconfig
index 52f859d41d..a8478a8150 100644
--- a/src/mainboard/intel/graysreef/Kconfig
+++ b/src/mainboard/intel/baskingridge/Kconfig
@@ -1,4 +1,4 @@
-if BOARD_INTEL_GRAYSREEF
+if BOARD_INTEL_BASKING_RIDGE
 
 config BOARD_SPECIFIC_OPTIONS # dummy
 	def_bool y
@@ -20,11 +20,11 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 
 config MAINBOARD_DIR
 	string
-	default intel/graysreef
+	default intel/baskingridge
 
 config MAINBOARD_PART_NUMBER
 	string
-	default "GRAYS REEF"
+	default "BASKING RIDGE"
 
 config MMCONF_BASE_ADDRESS
 	hex
@@ -42,4 +42,4 @@ config VGA_BIOS_FILE
 	string
 	default "pci8086,0166.rom"
 
-endif # BOARD_INTEL_GRAYSREEF
+endif # BOARD_INTEL_BASKING_RIDGE
diff --git a/src/mainboard/intel/graysreef/Makefile.inc b/src/mainboard/intel/baskingridge/Makefile.inc
similarity index 100%
rename from src/mainboard/intel/graysreef/Makefile.inc
rename to src/mainboard/intel/baskingridge/Makefile.inc
diff --git a/src/mainboard/intel/graysreef/acpi/chromeos.asl b/src/mainboard/intel/baskingridge/acpi/chromeos.asl
similarity index 100%
rename from src/mainboard/intel/graysreef/acpi/chromeos.asl
rename to src/mainboard/intel/baskingridge/acpi/chromeos.asl
diff --git a/src/mainboard/intel/graysreef/acpi/ec.asl b/src/mainboard/intel/baskingridge/acpi/ec.asl
similarity index 100%
rename from src/mainboard/intel/graysreef/acpi/ec.asl
rename to src/mainboard/intel/baskingridge/acpi/ec.asl
diff --git a/src/mainboard/intel/graysreef/acpi/haswell_pci_irqs.asl b/src/mainboard/intel/baskingridge/acpi/haswell_pci_irqs.asl
similarity index 100%
rename from src/mainboard/intel/graysreef/acpi/haswell_pci_irqs.asl
rename to src/mainboard/intel/baskingridge/acpi/haswell_pci_irqs.asl
diff --git a/src/mainboard/intel/graysreef/acpi/mainboard.asl b/src/mainboard/intel/baskingridge/acpi/mainboard.asl
similarity index 100%
rename from src/mainboard/intel/graysreef/acpi/mainboard.asl
rename to src/mainboard/intel/baskingridge/acpi/mainboard.asl
diff --git a/src/mainboard/intel/graysreef/acpi/platform.asl b/src/mainboard/intel/baskingridge/acpi/platform.asl
similarity index 100%
rename from src/mainboard/intel/graysreef/acpi/platform.asl
rename to src/mainboard/intel/baskingridge/acpi/platform.asl
diff --git a/src/mainboard/intel/graysreef/acpi/superio.asl b/src/mainboard/intel/baskingridge/acpi/superio.asl
similarity index 100%
rename from src/mainboard/intel/graysreef/acpi/superio.asl
rename to src/mainboard/intel/baskingridge/acpi/superio.asl
diff --git a/src/mainboard/intel/graysreef/acpi/thermal.asl b/src/mainboard/intel/baskingridge/acpi/thermal.asl
similarity index 100%
rename from src/mainboard/intel/graysreef/acpi/thermal.asl
rename to src/mainboard/intel/baskingridge/acpi/thermal.asl
diff --git a/src/mainboard/intel/graysreef/acpi/video.asl b/src/mainboard/intel/baskingridge/acpi/video.asl
similarity index 100%
rename from src/mainboard/intel/graysreef/acpi/video.asl
rename to src/mainboard/intel/baskingridge/acpi/video.asl
diff --git a/src/mainboard/intel/graysreef/acpi_tables.c b/src/mainboard/intel/baskingridge/acpi_tables.c
similarity index 100%
rename from src/mainboard/intel/graysreef/acpi_tables.c
rename to src/mainboard/intel/baskingridge/acpi_tables.c
diff --git a/src/mainboard/intel/graysreef/chromeos.c b/src/mainboard/intel/baskingridge/chromeos.c
similarity index 100%
rename from src/mainboard/intel/graysreef/chromeos.c
rename to src/mainboard/intel/baskingridge/chromeos.c
diff --git a/src/mainboard/intel/graysreef/cmos.layout b/src/mainboard/intel/baskingridge/cmos.layout
similarity index 100%
rename from src/mainboard/intel/graysreef/cmos.layout
rename to src/mainboard/intel/baskingridge/cmos.layout
diff --git a/src/mainboard/intel/graysreef/devicetree.cb b/src/mainboard/intel/baskingridge/devicetree.cb
similarity index 100%
rename from src/mainboard/intel/graysreef/devicetree.cb
rename to src/mainboard/intel/baskingridge/devicetree.cb
diff --git a/src/mainboard/intel/graysreef/dsdt.asl b/src/mainboard/intel/baskingridge/dsdt.asl
similarity index 100%
rename from src/mainboard/intel/graysreef/dsdt.asl
rename to src/mainboard/intel/baskingridge/dsdt.asl
diff --git a/src/mainboard/intel/graysreef/fadt.c b/src/mainboard/intel/baskingridge/fadt.c
similarity index 100%
rename from src/mainboard/intel/graysreef/fadt.c
rename to src/mainboard/intel/baskingridge/fadt.c
diff --git a/src/mainboard/intel/graysreef/gpio.h b/src/mainboard/intel/baskingridge/gpio.h
similarity index 98%
rename from src/mainboard/intel/graysreef/gpio.h
rename to src/mainboard/intel/baskingridge/gpio.h
index f5ee547d09..13126bf427 100644
--- a/src/mainboard/intel/graysreef/gpio.h
+++ b/src/mainboard/intel/baskingridge/gpio.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GRAYSREEF_GPIO_H
-#define GRAYSREEF_GPIO_H
+#ifndef BASKING_RIDGE_GPIO_H
+#define BASKING_RIDGE_GPIO_H
 
 #include "southbridge/intel/lynxpoint/gpio.h"
 
@@ -225,7 +225,7 @@ const struct pch_gpio_set3 pch_gpio_set3_level = {
 	.gpio68 = GPIO_LEVEL_HIGH,
 };
 
-const struct pch_gpio_map graysreef_gpio_map = {
+const struct pch_gpio_map mainboard_gpio_map = {
 	.set1 = {
 		.mode      = &pch_gpio_set1_mode,
 		.direction = &pch_gpio_set1_direction,
diff --git a/src/mainboard/intel/graysreef/hda_verb.h b/src/mainboard/intel/baskingridge/hda_verb.h
similarity index 100%
rename from src/mainboard/intel/graysreef/hda_verb.h
rename to src/mainboard/intel/baskingridge/hda_verb.h
diff --git a/src/mainboard/intel/graysreef/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c
similarity index 100%
rename from src/mainboard/intel/graysreef/mainboard.c
rename to src/mainboard/intel/baskingridge/mainboard.c
diff --git a/src/mainboard/intel/graysreef/mainboard_smi.c b/src/mainboard/intel/baskingridge/mainboard_smi.c
similarity index 100%
rename from src/mainboard/intel/graysreef/mainboard_smi.c
rename to src/mainboard/intel/baskingridge/mainboard_smi.c
diff --git a/src/mainboard/intel/graysreef/onboard.h b/src/mainboard/intel/baskingridge/onboard.h
similarity index 100%
rename from src/mainboard/intel/graysreef/onboard.h
rename to src/mainboard/intel/baskingridge/onboard.h
diff --git a/src/mainboard/intel/graysreef/romstage.c b/src/mainboard/intel/baskingridge/romstage.c
similarity index 99%
rename from src/mainboard/intel/graysreef/romstage.c
rename to src/mainboard/intel/baskingridge/romstage.c
index c12e03c7e4..2a8e910490 100644
--- a/src/mainboard/intel/graysreef/romstage.c
+++ b/src/mainboard/intel/baskingridge/romstage.c
@@ -185,7 +185,7 @@ void main(unsigned long bist)
 	/* Enable GPIOs */
 	pci_write_config32(PCH_LPC_DEV, GPIO_BASE, DEFAULT_GPIOBASE|1);
 	pci_write_config8(PCH_LPC_DEV, GPIO_CNTL, 0x10);
-	setup_pch_gpios(&graysreef_gpio_map);
+	setup_pch_gpios(&mainboard_gpio_map);
 
 	/* Early Console setup */
 	console_init();
diff --git a/src/mainboard/intel/graysreef/thermal.h b/src/mainboard/intel/baskingridge/thermal.h
similarity index 96%
rename from src/mainboard/intel/graysreef/thermal.h
rename to src/mainboard/intel/baskingridge/thermal.h
index 2068686511..d8c00254e9 100644
--- a/src/mainboard/intel/graysreef/thermal.h
+++ b/src/mainboard/intel/baskingridge/thermal.h
@@ -17,8 +17,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef GRAYSREEF_THERMAL_H
-#define GRAYSREEF_THERMAL_H
+#ifndef BASKING_RIDGE_THERMAL_H
+#define BASKING_RIDGE_THERMAL_H
 
 /* Fan is OFF */
 #define FAN4_THRESHOLD_OFF	0