diff --git a/src/mainboard/clevo/l140cu/Kconfig b/src/mainboard/clevo/cml-u/Kconfig
similarity index 98%
rename from src/mainboard/clevo/l140cu/Kconfig
rename to src/mainboard/clevo/cml-u/Kconfig
index c158adddfc..bc75df9216 100644
--- a/src/mainboard/clevo/l140cu/Kconfig
+++ b/src/mainboard/clevo/cml-u/Kconfig
@@ -23,7 +23,7 @@ config BOARD_SPECIFIC_OPTIONS
 
 config MAINBOARD_DIR
 	string
-	default "clevo/l140cu"
+	default "clevo/cml-u"
 
 config MAINBOARD_PART_NUMBER
 	string
diff --git a/src/mainboard/clevo/l140cu/Kconfig.name b/src/mainboard/clevo/cml-u/Kconfig.name
similarity index 100%
rename from src/mainboard/clevo/l140cu/Kconfig.name
rename to src/mainboard/clevo/cml-u/Kconfig.name
diff --git a/src/mainboard/clevo/l140cu/Makefile.inc b/src/mainboard/clevo/cml-u/Makefile.inc
similarity index 100%
rename from src/mainboard/clevo/l140cu/Makefile.inc
rename to src/mainboard/clevo/cml-u/Makefile.inc
diff --git a/src/mainboard/clevo/l140cu/acpi/gpe.asl b/src/mainboard/clevo/cml-u/acpi/gpe.asl
similarity index 100%
rename from src/mainboard/clevo/l140cu/acpi/gpe.asl
rename to src/mainboard/clevo/cml-u/acpi/gpe.asl
diff --git a/src/mainboard/clevo/l140cu/acpi/mainboard.asl b/src/mainboard/clevo/cml-u/acpi/mainboard.asl
similarity index 100%
rename from src/mainboard/clevo/l140cu/acpi/mainboard.asl
rename to src/mainboard/clevo/cml-u/acpi/mainboard.asl
diff --git a/src/mainboard/clevo/l140cu/acpi/sleep.asl b/src/mainboard/clevo/cml-u/acpi/sleep.asl
similarity index 100%
rename from src/mainboard/clevo/l140cu/acpi/sleep.asl
rename to src/mainboard/clevo/cml-u/acpi/sleep.asl
diff --git a/src/mainboard/clevo/l140cu/board_info.txt b/src/mainboard/clevo/cml-u/board_info.txt
similarity index 100%
rename from src/mainboard/clevo/l140cu/board_info.txt
rename to src/mainboard/clevo/cml-u/board_info.txt
diff --git a/src/mainboard/clevo/l140cu/dsdt.asl b/src/mainboard/clevo/cml-u/dsdt.asl
similarity index 100%
rename from src/mainboard/clevo/l140cu/dsdt.asl
rename to src/mainboard/clevo/cml-u/dsdt.asl
diff --git a/src/mainboard/clevo/l140cu/spd/samsung-K4AAG165WA-BCTD.spd.hex b/src/mainboard/clevo/cml-u/spd/samsung-K4AAG165WA-BCTD.spd.hex
similarity index 100%
rename from src/mainboard/clevo/l140cu/spd/samsung-K4AAG165WA-BCTD.spd.hex
rename to src/mainboard/clevo/cml-u/spd/samsung-K4AAG165WA-BCTD.spd.hex
diff --git a/src/mainboard/clevo/l140cu/variants/l140cu/Makefile.inc b/src/mainboard/clevo/cml-u/variants/l140cu/Makefile.inc
similarity index 100%
rename from src/mainboard/clevo/l140cu/variants/l140cu/Makefile.inc
rename to src/mainboard/clevo/cml-u/variants/l140cu/Makefile.inc
diff --git a/src/mainboard/clevo/l140cu/variants/l140cu/board_info.txt b/src/mainboard/clevo/cml-u/variants/l140cu/board_info.txt
similarity index 100%
rename from src/mainboard/clevo/l140cu/variants/l140cu/board_info.txt
rename to src/mainboard/clevo/cml-u/variants/l140cu/board_info.txt
diff --git a/src/mainboard/clevo/l140cu/variants/l140cu/bootblock.c b/src/mainboard/clevo/cml-u/variants/l140cu/bootblock.c
similarity index 100%
rename from src/mainboard/clevo/l140cu/variants/l140cu/bootblock.c
rename to src/mainboard/clevo/cml-u/variants/l140cu/bootblock.c
diff --git a/src/mainboard/clevo/l140cu/variants/l140cu/data.vbt b/src/mainboard/clevo/cml-u/variants/l140cu/data.vbt
similarity index 100%
rename from src/mainboard/clevo/l140cu/variants/l140cu/data.vbt
rename to src/mainboard/clevo/cml-u/variants/l140cu/data.vbt
diff --git a/src/mainboard/clevo/l140cu/variants/l140cu/devicetree.cb b/src/mainboard/clevo/cml-u/variants/l140cu/devicetree.cb
similarity index 100%
rename from src/mainboard/clevo/l140cu/variants/l140cu/devicetree.cb
rename to src/mainboard/clevo/cml-u/variants/l140cu/devicetree.cb
diff --git a/src/mainboard/clevo/l140cu/variants/l140cu/gpio.h b/src/mainboard/clevo/cml-u/variants/l140cu/gpio.h
similarity index 100%
rename from src/mainboard/clevo/l140cu/variants/l140cu/gpio.h
rename to src/mainboard/clevo/cml-u/variants/l140cu/gpio.h
diff --git a/src/mainboard/clevo/l140cu/variants/l140cu/hda_verb.c b/src/mainboard/clevo/cml-u/variants/l140cu/hda_verb.c
similarity index 100%
rename from src/mainboard/clevo/l140cu/variants/l140cu/hda_verb.c
rename to src/mainboard/clevo/cml-u/variants/l140cu/hda_verb.c
diff --git a/src/mainboard/clevo/l140cu/variants/l140cu/ramstage.c b/src/mainboard/clevo/cml-u/variants/l140cu/ramstage.c
similarity index 100%
rename from src/mainboard/clevo/l140cu/variants/l140cu/ramstage.c
rename to src/mainboard/clevo/cml-u/variants/l140cu/ramstage.c
diff --git a/src/mainboard/clevo/l140cu/variants/l140cu/romstage.c b/src/mainboard/clevo/cml-u/variants/l140cu/romstage.c
similarity index 100%
rename from src/mainboard/clevo/l140cu/variants/l140cu/romstage.c
rename to src/mainboard/clevo/cml-u/variants/l140cu/romstage.c