diff --git a/src/mainboard/system76/gaze16/Kconfig b/src/mainboard/system76/tgl-h/Kconfig
similarity index 98%
rename from src/mainboard/system76/gaze16/Kconfig
rename to src/mainboard/system76/tgl-h/Kconfig
index 7d601382aa..cceb1ed374 100644
--- a/src/mainboard/system76/gaze16/Kconfig
+++ b/src/mainboard/system76/tgl-h/Kconfig
@@ -26,7 +26,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select TPM_RDRESP_NEED_DELAY
 
 config MAINBOARD_DIR
-	default "system76/gaze16"
+	default "system76/tgl-h"
 
 config MAINBOARD_PART_NUMBER
 	default "gaze16-3050" if BOARD_SYSTEM76_GAZE16_3050
diff --git a/src/mainboard/system76/gaze16/Kconfig.name b/src/mainboard/system76/tgl-h/Kconfig.name
similarity index 100%
rename from src/mainboard/system76/gaze16/Kconfig.name
rename to src/mainboard/system76/tgl-h/Kconfig.name
diff --git a/src/mainboard/system76/gaze16/Makefile.inc b/src/mainboard/system76/tgl-h/Makefile.inc
similarity index 100%
rename from src/mainboard/system76/gaze16/Makefile.inc
rename to src/mainboard/system76/tgl-h/Makefile.inc
diff --git a/src/mainboard/system76/gaze16/acpi/mainboard.asl b/src/mainboard/system76/tgl-h/acpi/mainboard.asl
similarity index 100%
rename from src/mainboard/system76/gaze16/acpi/mainboard.asl
rename to src/mainboard/system76/tgl-h/acpi/mainboard.asl
diff --git a/src/mainboard/system76/gaze16/acpi/sleep.asl b/src/mainboard/system76/tgl-h/acpi/sleep.asl
similarity index 100%
rename from src/mainboard/system76/gaze16/acpi/sleep.asl
rename to src/mainboard/system76/tgl-h/acpi/sleep.asl
diff --git a/src/mainboard/system76/gaze16/board_info.txt b/src/mainboard/system76/tgl-h/board_info.txt
similarity index 74%
rename from src/mainboard/system76/gaze16/board_info.txt
rename to src/mainboard/system76/tgl-h/board_info.txt
index 8b3be68b0b..badfb66706 100644
--- a/src/mainboard/system76/gaze16/board_info.txt
+++ b/src/mainboard/system76/tgl-h/board_info.txt
@@ -1,7 +1,5 @@
 Vendor name: System76
-Board name: gaze16
 Category: laptop
-Release year: 2021
 ROM package: SOIC-8
 ROM protocol: SPI
 ROM socketed: n
diff --git a/src/mainboard/system76/gaze16/bootblock.c b/src/mainboard/system76/tgl-h/bootblock.c
similarity index 100%
rename from src/mainboard/system76/gaze16/bootblock.c
rename to src/mainboard/system76/tgl-h/bootblock.c
diff --git a/src/mainboard/system76/gaze16/cmos.default b/src/mainboard/system76/tgl-h/cmos.default
similarity index 100%
rename from src/mainboard/system76/gaze16/cmos.default
rename to src/mainboard/system76/tgl-h/cmos.default
diff --git a/src/mainboard/system76/gaze16/cmos.layout b/src/mainboard/system76/tgl-h/cmos.layout
similarity index 100%
rename from src/mainboard/system76/gaze16/cmos.layout
rename to src/mainboard/system76/tgl-h/cmos.layout
diff --git a/src/mainboard/system76/gaze16/devicetree.cb b/src/mainboard/system76/tgl-h/devicetree.cb
similarity index 100%
rename from src/mainboard/system76/gaze16/devicetree.cb
rename to src/mainboard/system76/tgl-h/devicetree.cb
diff --git a/src/mainboard/system76/gaze16/dsdt.asl b/src/mainboard/system76/tgl-h/dsdt.asl
similarity index 100%
rename from src/mainboard/system76/gaze16/dsdt.asl
rename to src/mainboard/system76/tgl-h/dsdt.asl
diff --git a/src/mainboard/system76/gaze16/include/variant/gpio.h b/src/mainboard/system76/tgl-h/include/variant/gpio.h
similarity index 100%
rename from src/mainboard/system76/gaze16/include/variant/gpio.h
rename to src/mainboard/system76/tgl-h/include/variant/gpio.h
diff --git a/src/mainboard/system76/gaze16/include/variant/romstage.h b/src/mainboard/system76/tgl-h/include/variant/romstage.h
similarity index 100%
rename from src/mainboard/system76/gaze16/include/variant/romstage.h
rename to src/mainboard/system76/tgl-h/include/variant/romstage.h
diff --git a/src/mainboard/system76/gaze16/ramstage.c b/src/mainboard/system76/tgl-h/ramstage.c
similarity index 100%
rename from src/mainboard/system76/gaze16/ramstage.c
rename to src/mainboard/system76/tgl-h/ramstage.c
diff --git a/src/mainboard/system76/gaze16/romstage.c b/src/mainboard/system76/tgl-h/romstage.c
similarity index 100%
rename from src/mainboard/system76/gaze16/romstage.c
rename to src/mainboard/system76/tgl-h/romstage.c
diff --git a/src/mainboard/system76/tgl-h/variants/gaze16-3050/board_info.txt b/src/mainboard/system76/tgl-h/variants/gaze16-3050/board_info.txt
new file mode 100644
index 0000000000..6555d4d960
--- /dev/null
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3050/board_info.txt
@@ -0,0 +1,2 @@
+Board name: gaze16
+Release year: 2021
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/data.vbt b/src/mainboard/system76/tgl-h/variants/gaze16-3050/data.vbt
similarity index 100%
rename from src/mainboard/system76/gaze16/variants/gaze16-3050/data.vbt
rename to src/mainboard/system76/tgl-h/variants/gaze16-3050/data.vbt
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/gpio.c b/src/mainboard/system76/tgl-h/variants/gaze16-3050/gpio.c
similarity index 100%
rename from src/mainboard/system76/gaze16/variants/gaze16-3050/gpio.c
rename to src/mainboard/system76/tgl-h/variants/gaze16-3050/gpio.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/gpio_early.c b/src/mainboard/system76/tgl-h/variants/gaze16-3050/gpio_early.c
similarity index 100%
rename from src/mainboard/system76/gaze16/variants/gaze16-3050/gpio_early.c
rename to src/mainboard/system76/tgl-h/variants/gaze16-3050/gpio_early.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/hda_verb.c b/src/mainboard/system76/tgl-h/variants/gaze16-3050/hda_verb.c
similarity index 100%
rename from src/mainboard/system76/gaze16/variants/gaze16-3050/hda_verb.c
rename to src/mainboard/system76/tgl-h/variants/gaze16-3050/hda_verb.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/overridetree.cb b/src/mainboard/system76/tgl-h/variants/gaze16-3050/overridetree.cb
similarity index 100%
rename from src/mainboard/system76/gaze16/variants/gaze16-3050/overridetree.cb
rename to src/mainboard/system76/tgl-h/variants/gaze16-3050/overridetree.cb
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/ramstage.c b/src/mainboard/system76/tgl-h/variants/gaze16-3050/ramstage.c
similarity index 100%
rename from src/mainboard/system76/gaze16/variants/gaze16-3050/ramstage.c
rename to src/mainboard/system76/tgl-h/variants/gaze16-3050/ramstage.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3050/romstage.c b/src/mainboard/system76/tgl-h/variants/gaze16-3050/romstage.c
similarity index 100%
rename from src/mainboard/system76/gaze16/variants/gaze16-3050/romstage.c
rename to src/mainboard/system76/tgl-h/variants/gaze16-3050/romstage.c
diff --git a/src/mainboard/system76/tgl-h/variants/gaze16-3060/board_info.txt b/src/mainboard/system76/tgl-h/variants/gaze16-3060/board_info.txt
new file mode 100644
index 0000000000..6555d4d960
--- /dev/null
+++ b/src/mainboard/system76/tgl-h/variants/gaze16-3060/board_info.txt
@@ -0,0 +1,2 @@
+Board name: gaze16
+Release year: 2021
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/data.vbt b/src/mainboard/system76/tgl-h/variants/gaze16-3060/data.vbt
similarity index 100%
rename from src/mainboard/system76/gaze16/variants/gaze16-3060/data.vbt
rename to src/mainboard/system76/tgl-h/variants/gaze16-3060/data.vbt
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/gpio.c b/src/mainboard/system76/tgl-h/variants/gaze16-3060/gpio.c
similarity index 100%
rename from src/mainboard/system76/gaze16/variants/gaze16-3060/gpio.c
rename to src/mainboard/system76/tgl-h/variants/gaze16-3060/gpio.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/gpio_early.c b/src/mainboard/system76/tgl-h/variants/gaze16-3060/gpio_early.c
similarity index 100%
rename from src/mainboard/system76/gaze16/variants/gaze16-3060/gpio_early.c
rename to src/mainboard/system76/tgl-h/variants/gaze16-3060/gpio_early.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/hda_verb.c b/src/mainboard/system76/tgl-h/variants/gaze16-3060/hda_verb.c
similarity index 100%
rename from src/mainboard/system76/gaze16/variants/gaze16-3060/hda_verb.c
rename to src/mainboard/system76/tgl-h/variants/gaze16-3060/hda_verb.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/overridetree.cb b/src/mainboard/system76/tgl-h/variants/gaze16-3060/overridetree.cb
similarity index 100%
rename from src/mainboard/system76/gaze16/variants/gaze16-3060/overridetree.cb
rename to src/mainboard/system76/tgl-h/variants/gaze16-3060/overridetree.cb
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/ramstage.c b/src/mainboard/system76/tgl-h/variants/gaze16-3060/ramstage.c
similarity index 100%
rename from src/mainboard/system76/gaze16/variants/gaze16-3060/ramstage.c
rename to src/mainboard/system76/tgl-h/variants/gaze16-3060/ramstage.c
diff --git a/src/mainboard/system76/gaze16/variants/gaze16-3060/romstage.c b/src/mainboard/system76/tgl-h/variants/gaze16-3060/romstage.c
similarity index 100%
rename from src/mainboard/system76/gaze16/variants/gaze16-3060/romstage.c
rename to src/mainboard/system76/tgl-h/variants/gaze16-3060/romstage.c