46 files changed, 9 insertions, 9 deletions
diff --git a/src/mainboard/starlabs/labtop/Kconfig b/src/mainboard/starlabs/starbook/Kconfig
index e046648f3b..be2d339eb2 100644
--- a/src/mainboard/starlabs/labtop/Kconfig
+++ b/src/mainboard/starlabs/starbook/Kconfig
@@ -1,4 +1,4 @@
-config BOARD_STARLABS_LABTOP_SERIES
+config BOARD_STARLABS_STARBOOK_SERIES
 	def_bool n
 	select DRIVERS_I2C_HID
 	select EC_STARLABS_ITE
@@ -15,7 +15,7 @@ config BOARD_STARLABS_LABTOP_SERIES
 
 config BOARD_STARLABS_LABTOP_KBL
 	select BOARD_ROMSIZE_KB_8192
-	select BOARD_STARLABS_LABTOP_SERIES
+	select BOARD_STARLABS_STARBOOK_SERIES
 	select HAVE_INTEL_PTT
 	select HAVE_SPD_IN_CBFS
 	select MAINBOARD_HAS_LIBGFXINIT
@@ -24,7 +24,7 @@ config BOARD_STARLABS_LABTOP_KBL
 
 config BOARD_STARLABS_LABTOP_CML
 	select BOARD_ROMSIZE_KB_16384
-	select BOARD_STARLABS_LABTOP_SERIES
+	select BOARD_STARLABS_STARBOOK_SERIES
 	select EC_STARLABS_MAX_CHARGE
 	select EC_STARLABS_NEED_ITE_BIN
 	select HAVE_INTEL_PTT
@@ -37,7 +37,7 @@ config BOARD_STARLABS_LABTOP_CML
 
 config BOARD_STARLABS_STARBOOK_TGL
 	select BOARD_ROMSIZE_KB_16384
-	select BOARD_STARLABS_LABTOP_SERIES
+	select BOARD_STARLABS_STARBOOK_SERIES
 	select DRIVERS_INTEL_USB4_RETIMER
 	select EC_STARLABS_KBL_LEVELS
 	select EC_STARLABS_MAX_CHARGE
@@ -51,7 +51,7 @@ config BOARD_STARLABS_STARBOOK_TGL
 	select SOC_INTEL_TIGERLAKE_S3
 	select SPI_FLASH_WINBOND
 
-if BOARD_STARLABS_LABTOP_SERIES
+if BOARD_STARLABS_STARBOOK_SERIES
 
 config CCD_PORT
 	int
@@ -77,7 +77,7 @@ config EC_STARLABS_ADD_ITE_BIN
 config EC_STARLABS_ITE_BIN_PATH
 	string
 	depends on EC_STARLABS_NEED_ITE_BIN
-	default "3rdparty/blobs/mainboard/starlabs/starbook/\$(CONFIG_VARIANT_DIR)/ec.bin"
+	default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/\$(CONFIG_VARIANT_DIR)/ec.bin"
 
 config EC_VARIANT_DIR
 	default "kbl" if !EC_STARLABS_MERLIN && BOARD_STARLABS_LABTOP_KBL
@@ -92,7 +92,7 @@ config IFD_BIN_PATH
 	default "3rdparty/blobs/mainboard/\$(MAINBOARDDIR)/\$(CONFIG_VARIANT_DIR)/flashdescriptor.bin"
 
 config MAINBOARD_DIR
-	default "starlabs/labtop"
+	default "starlabs/starbook"
 
 config MAINBOARD_FAMILY
 	string
diff --git a/src/mainboard/starlabs/labtop/Kconfig.name b/src/mainboard/starlabs/starbook/Kconfig.name
index e1583d49c4..3db0d38554 100644
--- a/src/mainboard/starlabs/labtop/Kconfig.name
+++ b/src/mainboard/starlabs/starbook/Kconfig.name
@@ -1,4 +1,4 @@
-comment "Star Labs LabTop Series"
+comment "Star Labs StarBook Series"
 
 config BOARD_STARLABS_LABTOP_KBL
 	bool "Star Labs LabTop Mk III (i7-8550u)"
diff --git a/src/mainboard/starlabs/labtop/Makefile.inc b/src/mainboard/starlabs/starbook/Makefile.inc
index dc26be0afa..dc26be0afa 100644
--- a/src/mainboard/starlabs/labtop/Makefile.inc
+++ b/src/mainboard/starlabs/starbook/Makefile.inc
diff --git a/src/mainboard/starlabs/labtop/acpi/ec.asl b/src/mainboard/starlabs/starbook/acpi/ec.asl
index 853b0877b3..853b0877b3 100644
--- a/src/mainboard/starlabs/labtop/acpi/ec.asl
+++ b/src/mainboard/starlabs/starbook/acpi/ec.asl
diff --git a/src/mainboard/starlabs/labtop/acpi/mainboard.asl b/src/mainboard/starlabs/starbook/acpi/mainboard.asl
index 5bdde36bb7..5bdde36bb7 100644
--- a/src/mainboard/starlabs/labtop/acpi/mainboard.asl
+++ b/src/mainboard/starlabs/starbook/acpi/mainboard.asl
diff --git a/src/mainboard/starlabs/labtop/acpi/sleep.asl b/src/mainboard/starlabs/starbook/acpi/sleep.asl
index 78a2d290db..78a2d290db 100644
--- a/src/mainboard/starlabs/labtop/acpi/sleep.asl
+++ b/src/mainboard/starlabs/starbook/acpi/sleep.asl
diff --git a/src/mainboard/starlabs/labtop/acpi/superio.asl b/src/mainboard/starlabs/starbook/acpi/superio.asl
index 853b0877b3..853b0877b3 100644
--- a/src/mainboard/starlabs/labtop/acpi/superio.asl
+++ b/src/mainboard/starlabs/starbook/acpi/superio.asl
diff --git a/src/mainboard/starlabs/labtop/board_info.txt b/src/mainboard/starlabs/starbook/board_info.txt
index 9e70dba3d6..f03e7fdba2 100644
--- a/src/mainboard/starlabs/labtop/board_info.txt
+++ b/src/mainboard/starlabs/starbook/board_info.txt
@@ -1,5 +1,5 @@
 Vendor name: Star Labs
-Board name: LabTop
+Board name: StarBook
 Category: laptop
 ROM protocol: SPI
 ROM socketed: n
diff --git a/src/mainboard/starlabs/labtop/bootblock.c b/src/mainboard/starlabs/starbook/bootblock.c
index ca48bb1ab2..ca48bb1ab2 100644
--- a/src/mainboard/starlabs/labtop/bootblock.c
+++ b/src/mainboard/starlabs/starbook/bootblock.c
diff --git a/src/mainboard/starlabs/labtop/cmos.default b/src/mainboard/starlabs/starbook/cmos.default
index 0783adf403..0783adf403 100644
--- a/src/mainboard/starlabs/labtop/cmos.default
+++ b/src/mainboard/starlabs/starbook/cmos.default
diff --git a/src/mainboard/starlabs/labtop/cmos.layout b/src/mainboard/starlabs/starbook/cmos.layout
index 85ec47772c..85ec47772c 100644
--- a/src/mainboard/starlabs/labtop/cmos.layout
+++ b/src/mainboard/starlabs/starbook/cmos.layout
diff --git a/src/mainboard/starlabs/labtop/dsdt.asl b/src/mainboard/starlabs/starbook/dsdt.asl
index bee42358db..bee42358db 100644
--- a/src/mainboard/starlabs/labtop/dsdt.asl
+++ b/src/mainboard/starlabs/starbook/dsdt.asl
diff --git a/src/mainboard/starlabs/labtop/hda_verb.c b/src/mainboard/starlabs/starbook/hda_verb.c
index 371ab5d5f7..371ab5d5f7 100644
--- a/src/mainboard/starlabs/labtop/hda_verb.c
+++ b/src/mainboard/starlabs/starbook/hda_verb.c
diff --git a/src/mainboard/starlabs/labtop/include/variants.h b/src/mainboard/starlabs/starbook/include/variants.h
index 0dd41c062c..0dd41c062c 100644
--- a/src/mainboard/starlabs/labtop/include/variants.h
+++ b/src/mainboard/starlabs/starbook/include/variants.h
diff --git a/src/mainboard/starlabs/labtop/mainboard.c b/src/mainboard/starlabs/starbook/mainboard.c
index d394f2579d..d394f2579d 100644
--- a/src/mainboard/starlabs/labtop/mainboard.c
+++ b/src/mainboard/starlabs/starbook/mainboard.c
diff --git a/src/mainboard/starlabs/labtop/smbios.c b/src/mainboard/starlabs/starbook/smbios.c
index fbdbefd361..fbdbefd361 100644
--- a/src/mainboard/starlabs/labtop/smbios.c
+++ b/src/mainboard/starlabs/starbook/smbios.c
diff --git a/src/mainboard/starlabs/labtop/spd/Makefile.inc b/src/mainboard/starlabs/starbook/spd/Makefile.inc
index 9e7f4e377e..9e7f4e377e 100644
--- a/src/mainboard/starlabs/labtop/spd/Makefile.inc
+++ b/src/mainboard/starlabs/starbook/spd/Makefile.inc
diff --git a/src/mainboard/starlabs/labtop/spd/empty_ddr4.spd.hex b/src/mainboard/starlabs/starbook/spd/empty_ddr4.spd.hex
index 67b46cd239..67b46cd239 100644
--- a/src/mainboard/starlabs/labtop/spd/empty_ddr4.spd.hex
+++ b/src/mainboard/starlabs/starbook/spd/empty_ddr4.spd.hex
diff --git a/src/mainboard/starlabs/labtop/spd/micron-MT40A1G16KD-062E-E.spd.hex b/src/mainboard/starlabs/starbook/spd/micron-MT40A1G16KD-062E-E.spd.hex
index 17778473af..17778473af 100644
--- a/src/mainboard/starlabs/labtop/spd/micron-MT40A1G16KD-062E-E.spd.hex
+++ b/src/mainboard/starlabs/starbook/spd/micron-MT40A1G16KD-062E-E.spd.hex
diff --git a/src/mainboard/starlabs/labtop/spd/samsung-K4A8G165WB-BCRC.spd.hex b/src/mainboard/starlabs/starbook/spd/samsung-K4A8G165WB-BCRC.spd.hex
index 36b85a2035..36b85a2035 100644
--- a/src/mainboard/starlabs/labtop/spd/samsung-K4A8G165WB-BCRC.spd.hex
+++ b/src/mainboard/starlabs/starbook/spd/samsung-K4A8G165WB-BCRC.spd.hex
diff --git a/src/mainboard/starlabs/labtop/variants/cml/Makefile.inc b/src/mainboard/starlabs/starbook/variants/cml/Makefile.inc
index 2a505c35c7..2a505c35c7 100644
--- a/src/mainboard/starlabs/labtop/variants/cml/Makefile.inc
+++ b/src/mainboard/starlabs/starbook/variants/cml/Makefile.inc
diff --git a/src/mainboard/starlabs/labtop/variants/cml/board.fmd b/src/mainboard/starlabs/starbook/variants/cml/board.fmd
index 9018104edd..9018104edd 100644
--- a/src/mainboard/starlabs/labtop/variants/cml/board.fmd
+++ b/src/mainboard/starlabs/starbook/variants/cml/board.fmd
diff --git a/src/mainboard/starlabs/labtop/variants/cml/data.vbt b/src/mainboard/starlabs/starbook/variants/cml/data.vbt
index 4b31c96aad..4b31c96aad 100644
--- a/src/mainboard/starlabs/labtop/variants/cml/data.vbt
+++ b/src/mainboard/starlabs/starbook/variants/cml/data.vbt
diff --git a/src/mainboard/starlabs/labtop/variants/cml/devicetree.cb b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb
index 1d98612e33..1d98612e33 100644
--- a/src/mainboard/starlabs/labtop/variants/cml/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/cml/devicetree.cb
diff --git a/src/mainboard/starlabs/labtop/variants/cml/devtree.c b/src/mainboard/starlabs/starbook/variants/cml/devtree.c
index 95a5d44ea3..95a5d44ea3 100644
--- a/src/mainboard/starlabs/labtop/variants/cml/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/cml/devtree.c
diff --git a/src/mainboard/starlabs/labtop/variants/cml/gma-mainboard.ads b/src/mainboard/starlabs/starbook/variants/cml/gma-mainboard.ads
index 8402b39a94..8402b39a94 100644
--- a/src/mainboard/starlabs/labtop/variants/cml/gma-mainboard.ads
+++ b/src/mainboard/starlabs/starbook/variants/cml/gma-mainboard.ads
diff --git a/src/mainboard/starlabs/labtop/variants/cml/gpio.c b/src/mainboard/starlabs/starbook/variants/cml/gpio.c
index e29cd8199b..e29cd8199b 100644
--- a/src/mainboard/starlabs/labtop/variants/cml/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/cml/gpio.c
diff --git a/src/mainboard/starlabs/labtop/variants/cml/hda_verb.c b/src/mainboard/starlabs/starbook/variants/cml/hda_verb.c
index 76762a509c..76762a509c 100644
--- a/src/mainboard/starlabs/labtop/variants/cml/hda_verb.c
+++ b/src/mainboard/starlabs/starbook/variants/cml/hda_verb.c
diff --git a/src/mainboard/starlabs/labtop/variants/cml/romstage.c b/src/mainboard/starlabs/starbook/variants/cml/romstage.c
index 75a19e576b..75a19e576b 100644
--- a/src/mainboard/starlabs/labtop/variants/cml/romstage.c
+++ b/src/mainboard/starlabs/starbook/variants/cml/romstage.c
diff --git a/src/mainboard/starlabs/labtop/variants/kbl/Makefile.inc b/src/mainboard/starlabs/starbook/variants/kbl/Makefile.inc
index 2a505c35c7..2a505c35c7 100644
--- a/src/mainboard/starlabs/labtop/variants/kbl/Makefile.inc
+++ b/src/mainboard/starlabs/starbook/variants/kbl/Makefile.inc
diff --git a/src/mainboard/starlabs/labtop/variants/kbl/board.fmd b/src/mainboard/starlabs/starbook/variants/kbl/board.fmd
index ef63457460..ef63457460 100644
--- a/src/mainboard/starlabs/labtop/variants/kbl/board.fmd
+++ b/src/mainboard/starlabs/starbook/variants/kbl/board.fmd
diff --git a/src/mainboard/starlabs/labtop/variants/kbl/data.vbt b/src/mainboard/starlabs/starbook/variants/kbl/data.vbt
index 12010f3542..12010f3542 100644
--- a/src/mainboard/starlabs/labtop/variants/kbl/data.vbt
+++ b/src/mainboard/starlabs/starbook/variants/kbl/data.vbt
diff --git a/src/mainboard/starlabs/labtop/variants/kbl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/kbl/devicetree.cb
index 04dabb9d27..04dabb9d27 100644
--- a/src/mainboard/starlabs/labtop/variants/kbl/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/kbl/devicetree.cb
diff --git a/src/mainboard/starlabs/labtop/variants/kbl/devtree.c b/src/mainboard/starlabs/starbook/variants/kbl/devtree.c
index 898519e876..898519e876 100644
--- a/src/mainboard/starlabs/labtop/variants/kbl/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/kbl/devtree.c
diff --git a/src/mainboard/starlabs/labtop/variants/kbl/gma-mainboard.ads b/src/mainboard/starlabs/starbook/variants/kbl/gma-mainboard.ads
index 8402b39a94..8402b39a94 100644
--- a/src/mainboard/starlabs/labtop/variants/kbl/gma-mainboard.ads
+++ b/src/mainboard/starlabs/starbook/variants/kbl/gma-mainboard.ads
diff --git a/src/mainboard/starlabs/labtop/variants/kbl/gpio.c b/src/mainboard/starlabs/starbook/variants/kbl/gpio.c
index 9ab74148da..9ab74148da 100644
--- a/src/mainboard/starlabs/labtop/variants/kbl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/kbl/gpio.c
diff --git a/src/mainboard/starlabs/labtop/variants/kbl/hda_verb.c b/src/mainboard/starlabs/starbook/variants/kbl/hda_verb.c
index f09f37b094..f09f37b094 100644
--- a/src/mainboard/starlabs/labtop/variants/kbl/hda_verb.c
+++ b/src/mainboard/starlabs/starbook/variants/kbl/hda_verb.c
diff --git a/src/mainboard/starlabs/labtop/variants/kbl/romstage.c b/src/mainboard/starlabs/starbook/variants/kbl/romstage.c
index 098f753f1d..098f753f1d 100644
--- a/src/mainboard/starlabs/labtop/variants/kbl/romstage.c
+++ b/src/mainboard/starlabs/starbook/variants/kbl/romstage.c
diff --git a/src/mainboard/starlabs/labtop/variants/tgl/Makefile.inc b/src/mainboard/starlabs/starbook/variants/tgl/Makefile.inc
index 2a505c35c7..2a505c35c7 100644
--- a/src/mainboard/starlabs/labtop/variants/tgl/Makefile.inc
+++ b/src/mainboard/starlabs/starbook/variants/tgl/Makefile.inc
diff --git a/src/mainboard/starlabs/labtop/variants/tgl/board.fmd b/src/mainboard/starlabs/starbook/variants/tgl/board.fmd
index 932739e1e4..932739e1e4 100644
--- a/src/mainboard/starlabs/labtop/variants/tgl/board.fmd
+++ b/src/mainboard/starlabs/starbook/variants/tgl/board.fmd
diff --git a/src/mainboard/starlabs/labtop/variants/tgl/data.vbt b/src/mainboard/starlabs/starbook/variants/tgl/data.vbt
index 992a864623..992a864623 100644
--- a/src/mainboard/starlabs/labtop/variants/tgl/data.vbt
+++ b/src/mainboard/starlabs/starbook/variants/tgl/data.vbt
diff --git a/src/mainboard/starlabs/labtop/variants/tgl/devicetree.cb b/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb
index c5f7040058..c5f7040058 100644
--- a/src/mainboard/starlabs/labtop/variants/tgl/devicetree.cb
+++ b/src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb
diff --git a/src/mainboard/starlabs/labtop/variants/tgl/devtree.c b/src/mainboard/starlabs/starbook/variants/tgl/devtree.c
index 1c280c4a34..1c280c4a34 100644
--- a/src/mainboard/starlabs/labtop/variants/tgl/devtree.c
+++ b/src/mainboard/starlabs/starbook/variants/tgl/devtree.c
diff --git a/src/mainboard/starlabs/labtop/variants/tgl/gpio.c b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c
index 1ba1b817ef..1ba1b817ef 100644
--- a/src/mainboard/starlabs/labtop/variants/tgl/gpio.c
+++ b/src/mainboard/starlabs/starbook/variants/tgl/gpio.c
diff --git a/src/mainboard/starlabs/labtop/variants/tgl/hda_verb.c b/src/mainboard/starlabs/starbook/variants/tgl/hda_verb.c
index 7903d96259..7903d96259 100644
--- a/src/mainboard/starlabs/labtop/variants/tgl/hda_verb.c
+++ b/src/mainboard/starlabs/starbook/variants/tgl/hda_verb.c
diff --git a/src/mainboard/starlabs/labtop/variants/tgl/romstage.c b/src/mainboard/starlabs/starbook/variants/tgl/romstage.c
index 41e7f6dc4d..41e7f6dc4d 100644
--- a/src/mainboard/starlabs/labtop/variants/tgl/romstage.c
+++ b/src/mainboard/starlabs/starbook/variants/tgl/romstage.c