diff --git a/board/anbernic/rgxx3_rk3566/MAINTAINERS b/board/anbernic/rgxx3_rk3566/MAINTAINERS
index 647e49d..1c0d3fe 100644
--- a/board/anbernic/rgxx3_rk3566/MAINTAINERS
+++ b/board/anbernic/rgxx3_rk3566/MAINTAINERS
@@ -1,6 +1,6 @@
 RGXX3-RK3566
 M:	Chris Morgan <macromorgan@hotmail.com>
 S:	Maintained
-F:	board/anbernic/rgxx3-rk3566
-F:	include/configs/anbernic-rgxx3-rk3566
+F:	board/anbernic/rgxx3_rk3566
+F:	include/configs/anbernic-rgxx3-rk3566.h
 F:	configs/anbernic-rgxx3_defconfig
diff --git a/board/broadcom/bcmns/MAINTAINERS b/board/broadcom/bcmns/MAINTAINERS
index 86b68c9..63c6d8b 100644
--- a/board/broadcom/bcmns/MAINTAINERS
+++ b/board/broadcom/bcmns/MAINTAINERS
@@ -1,6 +1,6 @@
 BCMNS BOARD
 M:	Linus Walleij <linus.walleij@linaro.org>
 S:	Maintained
-F:	board/broadcom/bcmnsp/
+F:	board/broadcom/bcmns/
 F:	configs/bcmns_defconfig
-F:	include/configs/bcmnsp.h
+F:	include/configs/bcmns.h
diff --git a/board/bsh/imx6ulz_smm_m2/MAINTAINERS b/board/bsh/imx6ulz_smm_m2/MAINTAINERS
index 8f3d79d..77a033c 100644
--- a/board/bsh/imx6ulz_smm_m2/MAINTAINERS
+++ b/board/bsh/imx6ulz_smm_m2/MAINTAINERS
@@ -1,6 +1,6 @@
 MX6ULZ_SMM_M2 BOARD
 M:	Michael Trimarchi <michael@amarulasolutions.com>
 S:	Maintained
-F:	board/bsh/mx6ulz_smm_m2/
+F:	board/bsh/imx6ulz_smm_m2/
 F:	include/configs/imx6ulz_smm_m2.h
 F:	configs/imx6ulz_smm_m2_defconfig
diff --git a/board/cei/cei-tk1-som/MAINTAINERS b/board/cei/cei-tk1-som/MAINTAINERS
index 192e1a3..f181740 100644
--- a/board/cei/cei-tk1-som/MAINTAINERS
+++ b/board/cei/cei-tk1-som/MAINTAINERS
@@ -1,6 +1,6 @@
 TK1-SOM BOARD
 M:	Peter.Chubb@data61.csiro.au
 S:	Maintained
-F:	board/cei/tk1-som/
+F:	board/cei/cei-tk1-som/
 F:	include/configs/cei-tk1-som.h
 F:	configs/cei-tk1-som_defconfig
diff --git a/board/comtrend/ar5315u/MAINTAINERS b/board/comtrend/ar5315u/MAINTAINERS
index 048073c..0515e03 100644
--- a/board/comtrend/ar5315u/MAINTAINERS
+++ b/board/comtrend/ar5315u/MAINTAINERS
@@ -1,6 +1,6 @@
 COMTREND AR-5315U BOARD
 M:	Álvaro Fernández Rojas <noltari@gmail.com>
 S:	Maintained
-F:	board/comtrend/ar-5315u/
+F:	board/comtrend/ar5315u/
 F:	include/configs/comtrend_ar5315u.h
 F:	configs/comtrend_ar5315u_ram_defconfig
diff --git a/board/comtrend/ar5387un/MAINTAINERS b/board/comtrend/ar5387un/MAINTAINERS
index bcaac64..48757c9 100644
--- a/board/comtrend/ar5387un/MAINTAINERS
+++ b/board/comtrend/ar5387un/MAINTAINERS
@@ -1,6 +1,6 @@
 COMTREND AR-5387UN BOARD
 M:	Álvaro Fernández Rojas <noltari@gmail.com>
 S:	Maintained
-F:	board/comtrend/ar-5387un/
+F:	board/comtrend/ar5387un/
 F:	include/configs/comtrend_ar5387un.h
 F:	configs/comtrend_ar5387un_ram_defconfig
diff --git a/board/comtrend/ct5361/MAINTAINERS b/board/comtrend/ct5361/MAINTAINERS
index aea737a..3373e50 100644
--- a/board/comtrend/ct5361/MAINTAINERS
+++ b/board/comtrend/ct5361/MAINTAINERS
@@ -1,6 +1,6 @@
 COMTREND CT-5361 BOARD
 M:	Álvaro Fernández Rojas <noltari@gmail.com>
 S:	Maintained
-F:	board/comtrend/ct-5361/
+F:	board/comtrend/ct5361/
 F:	include/configs/comtrend_ct5361.h
 F:	configs/comtrend_ct5361_ram_defconfig
diff --git a/board/comtrend/vr3032u/MAINTAINERS b/board/comtrend/vr3032u/MAINTAINERS
index 833d7da..132101f 100644
--- a/board/comtrend/vr3032u/MAINTAINERS
+++ b/board/comtrend/vr3032u/MAINTAINERS
@@ -1,6 +1,6 @@
 COMTREND VR-3032U BOARD
 M:	Álvaro Fernández Rojas <noltari@gmail.com>
 S:	Maintained
-F:	board/comtrend/vr-3032u/
+F:	board/comtrend/vr3032u/
 F:	include/configs/comtrend_vr-3032u.h
 F:	configs/comtrend_vr3032u_ram_defconfig
diff --git a/board/comtrend/wap5813n/MAINTAINERS b/board/comtrend/wap5813n/MAINTAINERS
index f4d9979..c676483 100644
--- a/board/comtrend/wap5813n/MAINTAINERS
+++ b/board/comtrend/wap5813n/MAINTAINERS
@@ -1,6 +1,6 @@
 COMTREND WAP-5813N BOARD
 M:	Álvaro Fernández Rojas <noltari@gmail.com>
 S:	Maintained
-F:	board/comtrend/wap-5813n/
+F:	board/comtrend/wap5813n/
 F:	include/configs/comtrend_wap-5813n.h
 F:	configs/comtrend_wap5813n_ram_defconfig
diff --git a/board/data_modul/imx8mm_edm_sbc/MAINTAINERS b/board/data_modul/imx8mm_edm_sbc/MAINTAINERS
index 72659c0..36af19b 100644
--- a/board/data_modul/imx8mm_edm_sbc/MAINTAINERS
+++ b/board/data_modul/imx8mm_edm_sbc/MAINTAINERS
@@ -3,6 +3,6 @@
 S:	Maintained
 F:	arch/arm/dts/imx8mm-data-modul-edm-sbc.dts
 F:	arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi
-F:	board/data_modul/imx8mm_data_modul_edm_sbc/
+F:	board/data_modul/imx8mm_edm_sbc/
 F:	configs/imx8mm_data_modul_edm_sbc_defconfig
 F:	include/configs/imx8mm_data_modul_edm_sbc.h
diff --git a/board/data_modul/imx8mp_edm_sbc/MAINTAINERS b/board/data_modul/imx8mp_edm_sbc/MAINTAINERS
index a67e104..8a49c8a 100644
--- a/board/data_modul/imx8mp_edm_sbc/MAINTAINERS
+++ b/board/data_modul/imx8mp_edm_sbc/MAINTAINERS
@@ -3,6 +3,6 @@
 S:	Maintained
 F:	arch/arm/dts/imx8mp-data-modul-edm-sbc.dts
 F:	arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi
-F:	board/data_modul/imx8mp_data_modul_edm_sbc/
+F:	board/data_modul/imx8mp_edm_sbc/
 F:	configs/imx8mp_data_modul_edm_sbc_defconfig
 F:	include/configs/imx8mp_data_modul_edm_sbc.h
diff --git a/board/google/chromebox_panther/MAINTAINERS b/board/google/chromebox_panther/MAINTAINERS
index c88774b..4963a89 100644
--- a/board/google/chromebox_panther/MAINTAINERS
+++ b/board/google/chromebox_panther/MAINTAINERS
@@ -1,6 +1,6 @@
 CHROMEBOX PANTHER BOARD
 M:	Simon Glass <sjg@chromium.org>
 S:	Maintained
-F:	board/google/chromebook_panther/
+F:	board/google/chromebox_panther/
 F:	include/configs/chromebox_panther.h
 F:	configs/chromebox_panther_defconfig
diff --git a/board/hardkernel/odroid_go2/MAINTAINERS b/board/hardkernel/odroid_go2/MAINTAINERS
index eab622a..4d4c6e8 100644
--- a/board/hardkernel/odroid_go2/MAINTAINERS
+++ b/board/hardkernel/odroid_go2/MAINTAINERS
@@ -1,6 +1,6 @@
 GO2
 M:      Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
 S:      Maintained
-F:      board/odroid/go2
+F:      board/hardkernel/odroid_go2/
 F:      include/configs/odroid_go2.h
 F:      configs/odroid-go2_defconfig
diff --git a/board/pine64/pinebook-pro-rk3399/MAINTAINERS b/board/pine64/pinebook-pro-rk3399/MAINTAINERS
index 227c1c0..7300ca1 100644
--- a/board/pine64/pinebook-pro-rk3399/MAINTAINERS
+++ b/board/pine64/pinebook-pro-rk3399/MAINTAINERS
@@ -1,7 +1,7 @@
 PINEBOOK_PRO
 M:	Peter Robinson <pbrobinson@gmail.com>
 S:	Maintained
-F:	board/pine64/rk3399-pinebook-pro/
+F:	board/pine64/pinebook-pro-rk3399/
 F:	include/configs/rk3399-pinebook-pro.h
 F:	arch/arm/dts/rk3399-pinebook-pro.dts
 F:	arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
diff --git a/board/pine64/pinephone-pro-rk3399/MAINTAINERS b/board/pine64/pinephone-pro-rk3399/MAINTAINERS
index c923ff1..bc2dcdd 100644
--- a/board/pine64/pinephone-pro-rk3399/MAINTAINERS
+++ b/board/pine64/pinephone-pro-rk3399/MAINTAINERS
@@ -1,7 +1,7 @@
 PINEPHONE_PRO
 M:	Peter Robinson <pbrobinson@gmail.com>
 S:	Maintained
-F:	board/pine64/rk3399-pinephone-pro/
+F:	board/pine64/pinephone-pro-rk3399/
 F:	include/configs/rk3399-pinephone-pro.h
 F:	arch/arm/dts/rk3399-pinephone-pro.dts
 F:	arch/arm/dts/rk3399-pinephone-pro-u-boot.dtsi
diff --git a/board/ronetix/imx7-cm/MAINTAINERS b/board/ronetix/imx7-cm/MAINTAINERS
index 184c887..158c2b7 100644
--- a/board/ronetix/imx7-cm/MAINTAINERS
+++ b/board/ronetix/imx7-cm/MAINTAINERS
@@ -1,6 +1,6 @@
 i.MX7-CM BOARD
 M:	Ilko Iliev <iliev@ronetix.com>
 S:	Maintained
-F:	board/ronetix/imx7_cm/
-F:	include/configs/imx7_cm.h
-F:	configs/imx7_cm_defconfig
\ No newline at end of file
+F:	board/ronetix/imx7-cm/
+F:	include/configs/imx7-cm.h
+F:	configs/imx7_cm_defconfig
diff --git a/board/seeed/npi_imx6ull/MAINTAINERS b/board/seeed/npi_imx6ull/MAINTAINERS
index c6a915c..ddf4984 100644
--- a/board/seeed/npi_imx6ull/MAINTAINERS
+++ b/board/seeed/npi_imx6ull/MAINTAINERS
@@ -4,6 +4,6 @@
 F:	arch/arm/dts/imx6ull-seeed-npi-imx6ull-dev-board.dts
 F:	arch/arm/dts/imx6ull-seeed-npi-imx6ull-u-boot.dtsi
 F:	arch/arm/dts/imx6ull-seeed-npi-imx6ull.dtsi
-F:	board/seeed/npi-imx6ull/
+F:	board/seeed/npi_imx6ull/
 F:	configs/seeed_npi_imx6ull_defconfig
 F:	include/configs/npi_imx6ull.h
diff --git a/board/solidrun/clearfog/MAINTAINERS b/board/solidrun/clearfog/MAINTAINERS
index 55bd127..6b2d5d1 100644
--- a/board/solidrun/clearfog/MAINTAINERS
+++ b/board/solidrun/clearfog/MAINTAINERS
@@ -1,7 +1,7 @@
 CLEARFOG BOARD
 M:	Stefan Roese <sr@denx.de>
 S:	Maintained
-F:	board/soldrun/clearfog/
+F:	board/solidrun/clearfog/
 F:	include/configs/clearfog.h
 F:	configs/clearfog_defconfig
 F:	configs/clearfog_gt_8k_defconfig
diff --git a/board/vamrs/rock960_rk3399/MAINTAINERS b/board/vamrs/rock960_rk3399/MAINTAINERS
index 5ee5256..8821672 100644
--- a/board/vamrs/rock960_rk3399/MAINTAINERS
+++ b/board/vamrs/rock960_rk3399/MAINTAINERS
@@ -1,7 +1,7 @@
 ROCK960-RK3399
 M:      Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
 S:      Maintained
-F:      board/rockchip/rock960_rk3399
+F:      board/vamrs/rock960_rk3399/
 F:      include/configs/rock960_rk3399.h
 F:      configs/rock960-rk3399_defconfig