diff --git a/src/mainboard/hp/z220_series/Kconfig b/src/mainboard/hp/snb_ivb_desktops/Kconfig
similarity index 88%
rename from src/mainboard/hp/z220_series/Kconfig
rename to src/mainboard/hp/snb_ivb_desktops/Kconfig
index 2db3f5a..4cbb5e2 100644
--- a/src/mainboard/hp/z220_series/Kconfig
+++ b/src/mainboard/hp/snb_ivb_desktops/Kconfig
@@ -1,4 +1,4 @@
-config BOARD_HP_Z220_SERIES_COMMON
+config BOARD_HP_SNB_IVB_DESKTOPS_COMMON
 	def_bool n
 	select BOARD_ROMSIZE_KB_16384
 	select GFX_GMA_ANALOG_I2C_HDMI_B
@@ -19,12 +19,12 @@
 	select USE_NATIVE_RAMINIT
 
 config BOARD_HP_Z220_CMT_WORKSTATION
-	select BOARD_HP_Z220_SERIES_COMMON
+	select BOARD_HP_SNB_IVB_DESKTOPS_COMMON
 
 config BOARD_HP_Z220_SFF_WORKSTATION
-	select BOARD_HP_Z220_SERIES_COMMON
+	select BOARD_HP_SNB_IVB_DESKTOPS_COMMON
 
-if BOARD_HP_Z220_SERIES_COMMON
+if BOARD_HP_SNB_IVB_DESKTOPS_COMMON
 
 config VBOOT
 	select GBB_FLAG_DISABLE_EC_SOFTWARE_SYNC
@@ -38,7 +38,7 @@
 	default 0x570000
 
 config MAINBOARD_DIR
-	default "hp/z220_series"
+	default "hp/snb_ivb_desktops"
 
 config VARIANT_DIR
 	default "z220_cmt_workstation" if BOARD_HP_Z220_CMT_WORKSTATION
diff --git a/src/mainboard/hp/z220_series/Kconfig.name b/src/mainboard/hp/snb_ivb_desktops/Kconfig.name
similarity index 100%
rename from src/mainboard/hp/z220_series/Kconfig.name
rename to src/mainboard/hp/snb_ivb_desktops/Kconfig.name
diff --git a/src/mainboard/hp/z220_series/Makefile.inc b/src/mainboard/hp/snb_ivb_desktops/Makefile.inc
similarity index 100%
rename from src/mainboard/hp/z220_series/Makefile.inc
rename to src/mainboard/hp/snb_ivb_desktops/Makefile.inc
diff --git a/src/mainboard/hp/z220_series/acpi/ec.asl b/src/mainboard/hp/snb_ivb_desktops/acpi/ec.asl
similarity index 100%
rename from src/mainboard/hp/z220_series/acpi/ec.asl
rename to src/mainboard/hp/snb_ivb_desktops/acpi/ec.asl
diff --git a/src/mainboard/hp/z220_series/acpi/pci.asl b/src/mainboard/hp/snb_ivb_desktops/acpi/pci.asl
similarity index 100%
rename from src/mainboard/hp/z220_series/acpi/pci.asl
rename to src/mainboard/hp/snb_ivb_desktops/acpi/pci.asl
diff --git a/src/mainboard/hp/z220_series/acpi/platform.asl b/src/mainboard/hp/snb_ivb_desktops/acpi/platform.asl
similarity index 100%
rename from src/mainboard/hp/z220_series/acpi/platform.asl
rename to src/mainboard/hp/snb_ivb_desktops/acpi/platform.asl
diff --git a/src/mainboard/hp/z220_series/acpi/superio.asl b/src/mainboard/hp/snb_ivb_desktops/acpi/superio.asl
similarity index 100%
rename from src/mainboard/hp/z220_series/acpi/superio.asl
rename to src/mainboard/hp/snb_ivb_desktops/acpi/superio.asl
diff --git a/src/mainboard/hp/z220_series/board_info.txt b/src/mainboard/hp/snb_ivb_desktops/board_info.txt
similarity index 100%
rename from src/mainboard/hp/z220_series/board_info.txt
rename to src/mainboard/hp/snb_ivb_desktops/board_info.txt
diff --git a/src/mainboard/hp/z220_series/cmos.default b/src/mainboard/hp/snb_ivb_desktops/cmos.default
similarity index 100%
rename from src/mainboard/hp/z220_series/cmos.default
rename to src/mainboard/hp/snb_ivb_desktops/cmos.default
diff --git a/src/mainboard/hp/z220_series/cmos.layout b/src/mainboard/hp/snb_ivb_desktops/cmos.layout
similarity index 100%
rename from src/mainboard/hp/z220_series/cmos.layout
rename to src/mainboard/hp/snb_ivb_desktops/cmos.layout
diff --git a/src/mainboard/hp/z220_series/data.vbt b/src/mainboard/hp/snb_ivb_desktops/data.vbt
similarity index 100%
rename from src/mainboard/hp/z220_series/data.vbt
rename to src/mainboard/hp/snb_ivb_desktops/data.vbt
Binary files differ
diff --git a/src/mainboard/hp/z220_series/devicetree.cb b/src/mainboard/hp/snb_ivb_desktops/devicetree.cb
similarity index 100%
rename from src/mainboard/hp/z220_series/devicetree.cb
rename to src/mainboard/hp/snb_ivb_desktops/devicetree.cb
diff --git a/src/mainboard/hp/z220_series/dsdt.asl b/src/mainboard/hp/snb_ivb_desktops/dsdt.asl
similarity index 100%
rename from src/mainboard/hp/z220_series/dsdt.asl
rename to src/mainboard/hp/snb_ivb_desktops/dsdt.asl
diff --git a/src/mainboard/hp/z220_series/early_init.c b/src/mainboard/hp/snb_ivb_desktops/early_init.c
similarity index 100%
rename from src/mainboard/hp/z220_series/early_init.c
rename to src/mainboard/hp/snb_ivb_desktops/early_init.c
diff --git a/src/mainboard/hp/z220_series/gma-mainboard.ads b/src/mainboard/hp/snb_ivb_desktops/gma-mainboard.ads
similarity index 100%
rename from src/mainboard/hp/z220_series/gma-mainboard.ads
rename to src/mainboard/hp/snb_ivb_desktops/gma-mainboard.ads
diff --git a/src/mainboard/hp/z220_series/hda_verb.c b/src/mainboard/hp/snb_ivb_desktops/hda_verb.c
similarity index 100%
rename from src/mainboard/hp/z220_series/hda_verb.c
rename to src/mainboard/hp/snb_ivb_desktops/hda_verb.c
diff --git a/src/mainboard/hp/z220_series/mainboard.c b/src/mainboard/hp/snb_ivb_desktops/mainboard.c
similarity index 100%
rename from src/mainboard/hp/z220_series/mainboard.c
rename to src/mainboard/hp/snb_ivb_desktops/mainboard.c
diff --git a/src/mainboard/hp/z220_series/variants/z220_cmt_workstation/gpio.c b/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/gpio.c
similarity index 100%
rename from src/mainboard/hp/z220_series/variants/z220_cmt_workstation/gpio.c
rename to src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/gpio.c
diff --git a/src/mainboard/hp/z220_series/variants/z220_cmt_workstation/overridetree.cb b/src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb
similarity index 100%
rename from src/mainboard/hp/z220_series/variants/z220_cmt_workstation/overridetree.cb
rename to src/mainboard/hp/snb_ivb_desktops/variants/z220_cmt_workstation/overridetree.cb
diff --git a/src/mainboard/hp/z220_series/variants/z220_sff_workstation/gpio.c b/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/gpio.c
similarity index 100%
rename from src/mainboard/hp/z220_series/variants/z220_sff_workstation/gpio.c
rename to src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/gpio.c
diff --git a/src/mainboard/hp/z220_series/variants/z220_sff_workstation/overridetree.cb b/src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/overridetree.cb
similarity index 100%
rename from src/mainboard/hp/z220_series/variants/z220_sff_workstation/overridetree.cb
rename to src/mainboard/hp/snb_ivb_desktops/variants/z220_sff_workstation/overridetree.cb