diff --git a/boards/dragino/dragino_lsn50/Kconfig.dragino_lsn50 b/boards/dragino/lsn50/Kconfig.dragino_lsn50
similarity index 100%
rename from boards/dragino/dragino_lsn50/Kconfig.dragino_lsn50
rename to boards/dragino/lsn50/Kconfig.dragino_lsn50
diff --git a/boards/dragino/dragino_lsn50/board.cmake b/boards/dragino/lsn50/board.cmake
similarity index 100%
rename from boards/dragino/dragino_lsn50/board.cmake
rename to boards/dragino/lsn50/board.cmake
diff --git a/boards/dragino/dragino_lsn50/board.yml b/boards/dragino/lsn50/board.yml
similarity index 100%
rename from boards/dragino/dragino_lsn50/board.yml
rename to boards/dragino/lsn50/board.yml
diff --git a/boards/dragino/dragino_lsn50/doc/img/dragino_lsn50.jpg b/boards/dragino/lsn50/doc/img/dragino_lsn50.jpg
similarity index 100%
rename from boards/dragino/dragino_lsn50/doc/img/dragino_lsn50.jpg
rename to boards/dragino/lsn50/doc/img/dragino_lsn50.jpg
diff --git a/boards/dragino/dragino_lsn50/doc/index.rst b/boards/dragino/lsn50/doc/index.rst
similarity index 100%
rename from boards/dragino/dragino_lsn50/doc/index.rst
rename to boards/dragino/lsn50/doc/index.rst
diff --git a/boards/dragino/dragino_lsn50/dragino_lsn50.dts b/boards/dragino/lsn50/dragino_lsn50.dts
similarity index 100%
rename from boards/dragino/dragino_lsn50/dragino_lsn50.dts
rename to boards/dragino/lsn50/dragino_lsn50.dts
diff --git a/boards/dragino/dragino_lsn50/dragino_lsn50.yaml b/boards/dragino/lsn50/dragino_lsn50.yaml
similarity index 100%
rename from boards/dragino/dragino_lsn50/dragino_lsn50.yaml
rename to boards/dragino/lsn50/dragino_lsn50.yaml
diff --git a/boards/dragino/dragino_lsn50/dragino_lsn50_defconfig b/boards/dragino/lsn50/dragino_lsn50_defconfig
similarity index 100%
rename from boards/dragino/dragino_lsn50/dragino_lsn50_defconfig
rename to boards/dragino/lsn50/dragino_lsn50_defconfig
diff --git a/boards/dragino/dragino_lsn50/support/openocd.cfg b/boards/dragino/lsn50/support/openocd.cfg
similarity index 100%
rename from boards/dragino/dragino_lsn50/support/openocd.cfg
rename to boards/dragino/lsn50/support/openocd.cfg
diff --git a/boards/dragino/dragino_nbsn95/Kconfig.dragino_nbsn95 b/boards/dragino/nbsn95/Kconfig.dragino_nbsn95
similarity index 100%
rename from boards/dragino/dragino_nbsn95/Kconfig.dragino_nbsn95
rename to boards/dragino/nbsn95/Kconfig.dragino_nbsn95
diff --git a/boards/dragino/dragino_nbsn95/board.cmake b/boards/dragino/nbsn95/board.cmake
similarity index 100%
rename from boards/dragino/dragino_nbsn95/board.cmake
rename to boards/dragino/nbsn95/board.cmake
diff --git a/boards/dragino/dragino_nbsn95/board.yml b/boards/dragino/nbsn95/board.yml
similarity index 100%
rename from boards/dragino/dragino_nbsn95/board.yml
rename to boards/dragino/nbsn95/board.yml
diff --git a/boards/dragino/dragino_nbsn95/doc/img/dragino_nbsn95.jpg b/boards/dragino/nbsn95/doc/img/dragino_nbsn95.jpg
similarity index 100%
rename from boards/dragino/dragino_nbsn95/doc/img/dragino_nbsn95.jpg
rename to boards/dragino/nbsn95/doc/img/dragino_nbsn95.jpg
diff --git a/boards/dragino/dragino_nbsn95/doc/index.rst b/boards/dragino/nbsn95/doc/index.rst
similarity index 100%
rename from boards/dragino/dragino_nbsn95/doc/index.rst
rename to boards/dragino/nbsn95/doc/index.rst
diff --git a/boards/dragino/dragino_nbsn95/dragino_nbsn95.dts b/boards/dragino/nbsn95/dragino_nbsn95.dts
similarity index 100%
rename from boards/dragino/dragino_nbsn95/dragino_nbsn95.dts
rename to boards/dragino/nbsn95/dragino_nbsn95.dts
diff --git a/boards/dragino/dragino_nbsn95/dragino_nbsn95.yaml b/boards/dragino/nbsn95/dragino_nbsn95.yaml
similarity index 100%
rename from boards/dragino/dragino_nbsn95/dragino_nbsn95.yaml
rename to boards/dragino/nbsn95/dragino_nbsn95.yaml
diff --git a/boards/dragino/dragino_nbsn95/dragino_nbsn95_defconfig b/boards/dragino/nbsn95/dragino_nbsn95_defconfig
similarity index 100%
rename from boards/dragino/dragino_nbsn95/dragino_nbsn95_defconfig
rename to boards/dragino/nbsn95/dragino_nbsn95_defconfig
diff --git a/boards/dragino/dragino_nbsn95/support/openocd.cfg b/boards/dragino/nbsn95/support/openocd.cfg
similarity index 100%
rename from boards/dragino/dragino_nbsn95/support/openocd.cfg
rename to boards/dragino/nbsn95/support/openocd.cfg