diff --git a/src/mainboard/lenovo/t440p/Kconfig b/src/mainboard/lenovo/haswell/Kconfig
similarity index 98%
rename from src/mainboard/lenovo/t440p/Kconfig
rename to src/mainboard/lenovo/haswell/Kconfig
index 4e14907cd7..48b1103b3c 100644
--- a/src/mainboard/lenovo/t440p/Kconfig
+++ b/src/mainboard/lenovo/haswell/Kconfig
@@ -44,7 +44,7 @@ config FMDFILE
 	default "src/mainboard/\$(CONFIG_MAINBOARD_DIR)/vboot-rwab.fmd" if VBOOT
 
 config MAINBOARD_DIR
-	default "lenovo/t440p"
+	default "lenovo/haswell"
 
 config MAINBOARD_PART_NUMBER
 	default "ThinkPad T440p"
diff --git a/src/mainboard/lenovo/t440p/Kconfig.name b/src/mainboard/lenovo/haswell/Kconfig.name
similarity index 100%
rename from src/mainboard/lenovo/t440p/Kconfig.name
rename to src/mainboard/lenovo/haswell/Kconfig.name
diff --git a/src/mainboard/lenovo/t440p/Makefile.inc b/src/mainboard/lenovo/haswell/Makefile.inc
similarity index 100%
rename from src/mainboard/lenovo/t440p/Makefile.inc
rename to src/mainboard/lenovo/haswell/Makefile.inc
diff --git a/src/mainboard/lenovo/t440p/acpi/ec.asl b/src/mainboard/lenovo/haswell/acpi/ec.asl
similarity index 100%
rename from src/mainboard/lenovo/t440p/acpi/ec.asl
rename to src/mainboard/lenovo/haswell/acpi/ec.asl
diff --git a/src/mainboard/lenovo/t440p/acpi/platform.asl b/src/mainboard/lenovo/haswell/acpi/platform.asl
similarity index 100%
rename from src/mainboard/lenovo/t440p/acpi/platform.asl
rename to src/mainboard/lenovo/haswell/acpi/platform.asl
diff --git a/src/mainboard/lenovo/t440p/acpi/superio.asl b/src/mainboard/lenovo/haswell/acpi/superio.asl
similarity index 100%
rename from src/mainboard/lenovo/t440p/acpi/superio.asl
rename to src/mainboard/lenovo/haswell/acpi/superio.asl
diff --git a/src/mainboard/lenovo/t440p/acpi_tables.c b/src/mainboard/lenovo/haswell/acpi_tables.c
similarity index 100%
rename from src/mainboard/lenovo/t440p/acpi_tables.c
rename to src/mainboard/lenovo/haswell/acpi_tables.c
diff --git a/src/mainboard/lenovo/t440p/board_info.txt b/src/mainboard/lenovo/haswell/board_info.txt
similarity index 100%
rename from src/mainboard/lenovo/t440p/board_info.txt
rename to src/mainboard/lenovo/haswell/board_info.txt
diff --git a/src/mainboard/lenovo/t440p/cmos.default b/src/mainboard/lenovo/haswell/cmos.default
similarity index 100%
rename from src/mainboard/lenovo/t440p/cmos.default
rename to src/mainboard/lenovo/haswell/cmos.default
diff --git a/src/mainboard/lenovo/t440p/cmos.layout b/src/mainboard/lenovo/haswell/cmos.layout
similarity index 100%
rename from src/mainboard/lenovo/t440p/cmos.layout
rename to src/mainboard/lenovo/haswell/cmos.layout
diff --git a/src/mainboard/lenovo/t440p/data.vbt b/src/mainboard/lenovo/haswell/data.vbt
similarity index 100%
rename from src/mainboard/lenovo/t440p/data.vbt
rename to src/mainboard/lenovo/haswell/data.vbt
diff --git a/src/mainboard/lenovo/t440p/devicetree.cb b/src/mainboard/lenovo/haswell/devicetree.cb
similarity index 100%
rename from src/mainboard/lenovo/t440p/devicetree.cb
rename to src/mainboard/lenovo/haswell/devicetree.cb
diff --git a/src/mainboard/lenovo/t440p/dsdt.asl b/src/mainboard/lenovo/haswell/dsdt.asl
similarity index 100%
rename from src/mainboard/lenovo/t440p/dsdt.asl
rename to src/mainboard/lenovo/haswell/dsdt.asl
diff --git a/src/mainboard/lenovo/t440p/gma-mainboard.ads b/src/mainboard/lenovo/haswell/gma-mainboard.ads
similarity index 100%
rename from src/mainboard/lenovo/t440p/gma-mainboard.ads
rename to src/mainboard/lenovo/haswell/gma-mainboard.ads
diff --git a/src/mainboard/lenovo/t440p/gpio.c b/src/mainboard/lenovo/haswell/gpio.c
similarity index 100%
rename from src/mainboard/lenovo/t440p/gpio.c
rename to src/mainboard/lenovo/haswell/gpio.c
diff --git a/src/mainboard/lenovo/t440p/hda_verb.c b/src/mainboard/lenovo/haswell/hda_verb.c
similarity index 100%
rename from src/mainboard/lenovo/t440p/hda_verb.c
rename to src/mainboard/lenovo/haswell/hda_verb.c
diff --git a/src/mainboard/lenovo/t440p/mainboard.c b/src/mainboard/lenovo/haswell/mainboard.c
similarity index 100%
rename from src/mainboard/lenovo/t440p/mainboard.c
rename to src/mainboard/lenovo/haswell/mainboard.c
diff --git a/src/mainboard/lenovo/t440p/romstage.c b/src/mainboard/lenovo/haswell/romstage.c
similarity index 100%
rename from src/mainboard/lenovo/t440p/romstage.c
rename to src/mainboard/lenovo/haswell/romstage.c
diff --git a/src/mainboard/lenovo/t440p/smihandler.c b/src/mainboard/lenovo/haswell/smihandler.c
similarity index 100%
rename from src/mainboard/lenovo/t440p/smihandler.c
rename to src/mainboard/lenovo/haswell/smihandler.c
diff --git a/src/mainboard/lenovo/t440p/vboot-ro-me_clean.fmd b/src/mainboard/lenovo/haswell/vboot-ro-me_clean.fmd
similarity index 100%
rename from src/mainboard/lenovo/t440p/vboot-ro-me_clean.fmd
rename to src/mainboard/lenovo/haswell/vboot-ro-me_clean.fmd
diff --git a/src/mainboard/lenovo/t440p/vboot-ro.fmd b/src/mainboard/lenovo/haswell/vboot-ro.fmd
similarity index 100%
rename from src/mainboard/lenovo/t440p/vboot-ro.fmd
rename to src/mainboard/lenovo/haswell/vboot-ro.fmd
diff --git a/src/mainboard/lenovo/t440p/vboot-rwab.fmd b/src/mainboard/lenovo/haswell/vboot-rwab.fmd
similarity index 100%
rename from src/mainboard/lenovo/t440p/vboot-rwab.fmd
rename to src/mainboard/lenovo/haswell/vboot-rwab.fmd