diff --git a/src/mainboard/system76/adl-p/Kconfig b/src/mainboard/system76/adl/Kconfig
similarity index 98%
rename from src/mainboard/system76/adl-p/Kconfig
rename to src/mainboard/system76/adl/Kconfig
index 80c42a80b2..a45053414d 100644
--- a/src/mainboard/system76/adl-p/Kconfig
+++ b/src/mainboard/system76/adl/Kconfig
@@ -24,7 +24,7 @@ config BOARD_SPECIFIC_OPTIONS
 	select SYSTEM_TYPE_LAPTOP
 
 config MAINBOARD_DIR
-	default "system76/adl-p"
+	default "system76/adl"
 
 config VARIANT_DIR
 	default "darp8" if BOARD_SYSTEM76_DARP8
diff --git a/src/mainboard/system76/adl-p/Kconfig.name b/src/mainboard/system76/adl/Kconfig.name
similarity index 100%
rename from src/mainboard/system76/adl-p/Kconfig.name
rename to src/mainboard/system76/adl/Kconfig.name
diff --git a/src/mainboard/system76/adl-p/Makefile.inc b/src/mainboard/system76/adl/Makefile.inc
similarity index 100%
rename from src/mainboard/system76/adl-p/Makefile.inc
rename to src/mainboard/system76/adl/Makefile.inc
diff --git a/src/mainboard/system76/adl-p/acpi/backlight.asl b/src/mainboard/system76/adl/acpi/backlight.asl
similarity index 100%
rename from src/mainboard/system76/adl-p/acpi/backlight.asl
rename to src/mainboard/system76/adl/acpi/backlight.asl
diff --git a/src/mainboard/system76/adl-p/acpi/mainboard.asl b/src/mainboard/system76/adl/acpi/mainboard.asl
similarity index 100%
rename from src/mainboard/system76/adl-p/acpi/mainboard.asl
rename to src/mainboard/system76/adl/acpi/mainboard.asl
diff --git a/src/mainboard/system76/adl-p/acpi/sleep.asl b/src/mainboard/system76/adl/acpi/sleep.asl
similarity index 100%
rename from src/mainboard/system76/adl-p/acpi/sleep.asl
rename to src/mainboard/system76/adl/acpi/sleep.asl
diff --git a/src/mainboard/system76/adl-p/board_info.txt b/src/mainboard/system76/adl/board_info.txt
similarity index 100%
rename from src/mainboard/system76/adl-p/board_info.txt
rename to src/mainboard/system76/adl/board_info.txt
diff --git a/src/mainboard/system76/adl-p/bootblock.c b/src/mainboard/system76/adl/bootblock.c
similarity index 100%
rename from src/mainboard/system76/adl-p/bootblock.c
rename to src/mainboard/system76/adl/bootblock.c
diff --git a/src/mainboard/system76/adl-p/cmos.default b/src/mainboard/system76/adl/cmos.default
similarity index 100%
rename from src/mainboard/system76/adl-p/cmos.default
rename to src/mainboard/system76/adl/cmos.default
diff --git a/src/mainboard/system76/adl-p/cmos.layout b/src/mainboard/system76/adl/cmos.layout
similarity index 100%
rename from src/mainboard/system76/adl-p/cmos.layout
rename to src/mainboard/system76/adl/cmos.layout
diff --git a/src/mainboard/system76/adl-p/devicetree.cb b/src/mainboard/system76/adl/devicetree.cb
similarity index 100%
rename from src/mainboard/system76/adl-p/devicetree.cb
rename to src/mainboard/system76/adl/devicetree.cb
diff --git a/src/mainboard/system76/adl-p/dsdt.asl b/src/mainboard/system76/adl/dsdt.asl
similarity index 100%
rename from src/mainboard/system76/adl-p/dsdt.asl
rename to src/mainboard/system76/adl/dsdt.asl
diff --git a/src/mainboard/system76/adl-p/include/mainboard/gpio.h b/src/mainboard/system76/adl/include/mainboard/gpio.h
similarity index 100%
rename from src/mainboard/system76/adl-p/include/mainboard/gpio.h
rename to src/mainboard/system76/adl/include/mainboard/gpio.h
diff --git a/src/mainboard/system76/adl-p/ramstage.c b/src/mainboard/system76/adl/ramstage.c
similarity index 100%
rename from src/mainboard/system76/adl-p/ramstage.c
rename to src/mainboard/system76/adl/ramstage.c
diff --git a/src/mainboard/system76/adl-p/variants/darp8/board_info.txt b/src/mainboard/system76/adl/variants/darp8/board_info.txt
similarity index 100%
rename from src/mainboard/system76/adl-p/variants/darp8/board_info.txt
rename to src/mainboard/system76/adl/variants/darp8/board_info.txt
diff --git a/src/mainboard/system76/adl-p/variants/darp8/data.vbt b/src/mainboard/system76/adl/variants/darp8/data.vbt
similarity index 100%
rename from src/mainboard/system76/adl-p/variants/darp8/data.vbt
rename to src/mainboard/system76/adl/variants/darp8/data.vbt
diff --git a/src/mainboard/system76/adl-p/variants/darp8/gpio.c b/src/mainboard/system76/adl/variants/darp8/gpio.c
similarity index 100%
rename from src/mainboard/system76/adl-p/variants/darp8/gpio.c
rename to src/mainboard/system76/adl/variants/darp8/gpio.c
diff --git a/src/mainboard/system76/adl-p/variants/darp8/gpio_early.c b/src/mainboard/system76/adl/variants/darp8/gpio_early.c
similarity index 100%
rename from src/mainboard/system76/adl-p/variants/darp8/gpio_early.c
rename to src/mainboard/system76/adl/variants/darp8/gpio_early.c
diff --git a/src/mainboard/system76/adl-p/variants/darp8/hda_verb.c b/src/mainboard/system76/adl/variants/darp8/hda_verb.c
similarity index 100%
rename from src/mainboard/system76/adl-p/variants/darp8/hda_verb.c
rename to src/mainboard/system76/adl/variants/darp8/hda_verb.c
diff --git a/src/mainboard/system76/adl-p/variants/darp8/overridetree.cb b/src/mainboard/system76/adl/variants/darp8/overridetree.cb
similarity index 100%
rename from src/mainboard/system76/adl-p/variants/darp8/overridetree.cb
rename to src/mainboard/system76/adl/variants/darp8/overridetree.cb
diff --git a/src/mainboard/system76/adl-p/variants/darp8/romstage.c b/src/mainboard/system76/adl/variants/darp8/romstage.c
similarity index 100%
rename from src/mainboard/system76/adl-p/variants/darp8/romstage.c
rename to src/mainboard/system76/adl/variants/darp8/romstage.c
diff --git a/src/mainboard/system76/adl-p/variants/galp6/board_info.txt b/src/mainboard/system76/adl/variants/galp6/board_info.txt
similarity index 100%
rename from src/mainboard/system76/adl-p/variants/galp6/board_info.txt
rename to src/mainboard/system76/adl/variants/galp6/board_info.txt
diff --git a/src/mainboard/system76/adl-p/variants/galp6/data.vbt b/src/mainboard/system76/adl/variants/galp6/data.vbt
similarity index 100%
rename from src/mainboard/system76/adl-p/variants/galp6/data.vbt
rename to src/mainboard/system76/adl/variants/galp6/data.vbt
diff --git a/src/mainboard/system76/adl-p/variants/galp6/gpio.c b/src/mainboard/system76/adl/variants/galp6/gpio.c
similarity index 100%
rename from src/mainboard/system76/adl-p/variants/galp6/gpio.c
rename to src/mainboard/system76/adl/variants/galp6/gpio.c
diff --git a/src/mainboard/system76/adl-p/variants/galp6/gpio_early.c b/src/mainboard/system76/adl/variants/galp6/gpio_early.c
similarity index 100%
rename from src/mainboard/system76/adl-p/variants/galp6/gpio_early.c
rename to src/mainboard/system76/adl/variants/galp6/gpio_early.c
diff --git a/src/mainboard/system76/adl-p/variants/galp6/hda_verb.c b/src/mainboard/system76/adl/variants/galp6/hda_verb.c
similarity index 100%
rename from src/mainboard/system76/adl-p/variants/galp6/hda_verb.c
rename to src/mainboard/system76/adl/variants/galp6/hda_verb.c
diff --git a/src/mainboard/system76/adl-p/variants/galp6/overridetree.cb b/src/mainboard/system76/adl/variants/galp6/overridetree.cb
similarity index 100%
rename from src/mainboard/system76/adl-p/variants/galp6/overridetree.cb
rename to src/mainboard/system76/adl/variants/galp6/overridetree.cb
diff --git a/src/mainboard/system76/adl-p/variants/galp6/romstage.c b/src/mainboard/system76/adl/variants/galp6/romstage.c
similarity index 100%
rename from src/mainboard/system76/adl-p/variants/galp6/romstage.c
rename to src/mainboard/system76/adl/variants/galp6/romstage.c