diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig b/src/mainboard/gigabyte/ga-h61m-series/Kconfig
similarity index 98%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig
rename to src/mainboard/gigabyte/ga-h61m-series/Kconfig
index 67cefd1c0f..a005009c5c 100644
--- a/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig
+++ b/src/mainboard/gigabyte/ga-h61m-series/Kconfig
@@ -32,7 +32,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default "gigabyte/ga-h61m-s2pv"
+	default "gigabyte/ga-h61m-series"
 
 config VARIANT_DIR
 	string
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig.name b/src/mainboard/gigabyte/ga-h61m-series/Kconfig.name
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig.name
rename to src/mainboard/gigabyte/ga-h61m-series/Kconfig.name
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/Makefile.inc b/src/mainboard/gigabyte/ga-h61m-series/Makefile.inc
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/Makefile.inc
rename to src/mainboard/gigabyte/ga-h61m-series/Makefile.inc
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/acpi/ec.asl b/src/mainboard/gigabyte/ga-h61m-series/acpi/ec.asl
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/acpi/ec.asl
rename to src/mainboard/gigabyte/ga-h61m-series/acpi/ec.asl
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/acpi/mainboard.asl b/src/mainboard/gigabyte/ga-h61m-series/acpi/mainboard.asl
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/acpi/mainboard.asl
rename to src/mainboard/gigabyte/ga-h61m-series/acpi/mainboard.asl
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/acpi/platform.asl b/src/mainboard/gigabyte/ga-h61m-series/acpi/platform.asl
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/acpi/platform.asl
rename to src/mainboard/gigabyte/ga-h61m-series/acpi/platform.asl
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/acpi/superio.asl b/src/mainboard/gigabyte/ga-h61m-series/acpi/superio.asl
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/acpi/superio.asl
rename to src/mainboard/gigabyte/ga-h61m-series/acpi/superio.asl
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/acpi/thermal.asl b/src/mainboard/gigabyte/ga-h61m-series/acpi/thermal.asl
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/acpi/thermal.asl
rename to src/mainboard/gigabyte/ga-h61m-series/acpi/thermal.asl
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/acpi_tables.c b/src/mainboard/gigabyte/ga-h61m-series/acpi_tables.c
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/acpi_tables.c
rename to src/mainboard/gigabyte/ga-h61m-series/acpi_tables.c
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/board_info.txt b/src/mainboard/gigabyte/ga-h61m-series/board_info.txt
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/board_info.txt
rename to src/mainboard/gigabyte/ga-h61m-series/board_info.txt
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/cmos.default b/src/mainboard/gigabyte/ga-h61m-series/cmos.default
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/cmos.default
rename to src/mainboard/gigabyte/ga-h61m-series/cmos.default
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/cmos.layout b/src/mainboard/gigabyte/ga-h61m-series/cmos.layout
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/cmos.layout
rename to src/mainboard/gigabyte/ga-h61m-series/cmos.layout
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/data.vbt b/src/mainboard/gigabyte/ga-h61m-series/data.vbt
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/data.vbt
rename to src/mainboard/gigabyte/ga-h61m-series/data.vbt
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb b/src/mainboard/gigabyte/ga-h61m-series/devicetree.cb
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/devicetree.cb
rename to src/mainboard/gigabyte/ga-h61m-series/devicetree.cb
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl b/src/mainboard/gigabyte/ga-h61m-series/dsdt.asl
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/dsdt.asl
rename to src/mainboard/gigabyte/ga-h61m-series/dsdt.asl
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/early_init.c b/src/mainboard/gigabyte/ga-h61m-series/early_init.c
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/early_init.c
rename to src/mainboard/gigabyte/ga-h61m-series/early_init.c
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/gma-mainboard.ads b/src/mainboard/gigabyte/ga-h61m-series/gma-mainboard.ads
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/gma-mainboard.ads
rename to src/mainboard/gigabyte/ga-h61m-series/gma-mainboard.ads
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/hda_verb.c b/src/mainboard/gigabyte/ga-h61m-series/hda_verb.c
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/hda_verb.c
rename to src/mainboard/gigabyte/ga-h61m-series/hda_verb.c
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/mainboard.c b/src/mainboard/gigabyte/ga-h61m-series/mainboard.c
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/mainboard.c
rename to src/mainboard/gigabyte/ga-h61m-series/mainboard.c
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-ds2v/gpio.c b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-ds2v/gpio.c
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-ds2v/gpio.c
rename to src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-ds2v/gpio.c
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-ds2v/hda_verb.c b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-ds2v/hda_verb.c
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-ds2v/hda_verb.c
rename to src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-ds2v/hda_verb.c
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-ds2v/overridetree.cb b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-ds2v/overridetree.cb
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-ds2v/overridetree.cb
rename to src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-ds2v/overridetree.cb
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/gpio.c b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-s2pv/gpio.c
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/gpio.c
rename to src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-s2pv/gpio.c
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/hda_verb.c b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-s2pv/hda_verb.c
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/hda_verb.c
rename to src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-s2pv/hda_verb.c
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/overridetree.cb b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-s2pv/overridetree.cb
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61m-s2pv/overridetree.cb
rename to src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61m-s2pv/overridetree.cb
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/gpio.c b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61ma-d3v/gpio.c
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/gpio.c
rename to src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61ma-d3v/gpio.c
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/hda_verb.c b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61ma-d3v/hda_verb.c
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/hda_verb.c
rename to src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61ma-d3v/hda_verb.c
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/overridetree.cb b/src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61ma-d3v/overridetree.cb
similarity index 100%
rename from src/mainboard/gigabyte/ga-h61m-s2pv/variants/ga-h61ma-d3v/overridetree.cb
rename to src/mainboard/gigabyte/ga-h61m-series/variants/ga-h61ma-d3v/overridetree.cb