21 files changed, 5 insertions, 5 deletions
diff --git a/src/mainboard/hp/z220_series/Kconfig b/src/mainboard/hp/snb_ivb_desktops/Kconfig
index 2db3f5a19f..4cbb5e22ea 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 @@ config BOARD_HP_Z220_SERIES_COMMON
 	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 @@ config CBFS_SIZE
 	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
index d39eb498e2..d39eb498e2 100644
--- a/src/mainboard/hp/z220_series/Kconfig.name
+++ b/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
index 69ef08873b..69ef08873b 100644
--- a/src/mainboard/hp/z220_series/Makefile.inc
+++ b/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
index 16990d45f4..16990d45f4 100644
--- a/src/mainboard/hp/z220_series/acpi/ec.asl
+++ b/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
index ff3866a258..ff3866a258 100644
--- a/src/mainboard/hp/z220_series/acpi/pci.asl
+++ b/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
index 861d3cdf71..861d3cdf71 100644
--- a/src/mainboard/hp/z220_series/acpi/platform.asl
+++ b/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
index 506c6d4c2d..506c6d4c2d 100644
--- a/src/mainboard/hp/z220_series/acpi/superio.asl
+++ b/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
index 4d6f6f98b7..4d6f6f98b7 100644
--- a/src/mainboard/hp/z220_series/board_info.txt
+++ b/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
index 6d27a79c66..6d27a79c66 100644
--- a/src/mainboard/hp/z220_series/cmos.default
+++ b/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
index 1fc83b1a55..1fc83b1a55 100644
--- a/src/mainboard/hp/z220_series/cmos.layout
+++ b/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
index c1fd6d1e13..c1fd6d1e13 100644
--- a/src/mainboard/hp/z220_series/data.vbt
+++ b/src/mainboard/hp/snb_ivb_desktops/data.vbt
diff --git a/src/mainboard/hp/z220_series/devicetree.cb b/src/mainboard/hp/snb_ivb_desktops/devicetree.cb
index f02ff76123..f02ff76123 100644
--- a/src/mainboard/hp/z220_series/devicetree.cb
+++ b/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
index 57149b75b1..57149b75b1 100644
--- a/src/mainboard/hp/z220_series/dsdt.asl
+++ b/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
index 74a646238c..74a646238c 100644
--- a/src/mainboard/hp/z220_series/early_init.c
+++ b/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
index 686f7d44db..686f7d44db 100644
--- a/src/mainboard/hp/z220_series/gma-mainboard.ads
+++ b/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
index 27ab4b5275..27ab4b5275 100644
--- a/src/mainboard/hp/z220_series/hda_verb.c
+++ b/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
index 75dc3302a5..75dc3302a5 100644
--- a/src/mainboard/hp/z220_series/mainboard.c
+++ b/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
index fb80217291..fb80217291 100644
--- 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
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
index 55bdaac23a..55bdaac23a 100644
--- 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
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
index 401681f659..401681f659 100644
--- 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
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
index c31bf336d1..c31bf336d1 100644
--- 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