diff --git a/boards/sparkfun/sparkfun_pro_micro_rp2040/Kconfig.defconfig b/boards/sparkfun/pro_micro_rp2040/Kconfig.defconfig
similarity index 100%
rename from boards/sparkfun/sparkfun_pro_micro_rp2040/Kconfig.defconfig
rename to boards/sparkfun/pro_micro_rp2040/Kconfig.defconfig
diff --git a/boards/sparkfun/sparkfun_pro_micro_rp2040/Kconfig.sparkfun_pro_micro_rp2040 b/boards/sparkfun/pro_micro_rp2040/Kconfig.sparkfun_pro_micro_rp2040
similarity index 100%
rename from boards/sparkfun/sparkfun_pro_micro_rp2040/Kconfig.sparkfun_pro_micro_rp2040
rename to boards/sparkfun/pro_micro_rp2040/Kconfig.sparkfun_pro_micro_rp2040
diff --git a/boards/sparkfun/sparkfun_pro_micro_rp2040/board.cmake b/boards/sparkfun/pro_micro_rp2040/board.cmake
similarity index 100%
rename from boards/sparkfun/sparkfun_pro_micro_rp2040/board.cmake
rename to boards/sparkfun/pro_micro_rp2040/board.cmake
diff --git a/boards/sparkfun/sparkfun_pro_micro_rp2040/board.yml b/boards/sparkfun/pro_micro_rp2040/board.yml
similarity index 100%
rename from boards/sparkfun/sparkfun_pro_micro_rp2040/board.yml
rename to boards/sparkfun/pro_micro_rp2040/board.yml
diff --git a/boards/sparkfun/sparkfun_pro_micro_rp2040/doc/img/sparkfun_pro_micro_rp2040.jpg b/boards/sparkfun/pro_micro_rp2040/doc/img/sparkfun_pro_micro_rp2040.jpg
similarity index 100%
rename from boards/sparkfun/sparkfun_pro_micro_rp2040/doc/img/sparkfun_pro_micro_rp2040.jpg
rename to boards/sparkfun/pro_micro_rp2040/doc/img/sparkfun_pro_micro_rp2040.jpg
diff --git a/boards/sparkfun/sparkfun_pro_micro_rp2040/doc/index.rst b/boards/sparkfun/pro_micro_rp2040/doc/index.rst
similarity index 100%
rename from boards/sparkfun/sparkfun_pro_micro_rp2040/doc/index.rst
rename to boards/sparkfun/pro_micro_rp2040/doc/index.rst
diff --git a/boards/sparkfun/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_connector.dtsi b/boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_connector.dtsi
similarity index 100%
rename from boards/sparkfun/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_connector.dtsi
rename to boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_connector.dtsi
diff --git a/boards/sparkfun/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_rp2040-pinctrl.dtsi b/boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_rp2040-pinctrl.dtsi
similarity index 100%
rename from boards/sparkfun/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_rp2040-pinctrl.dtsi
rename to boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_rp2040-pinctrl.dtsi
diff --git a/boards/sparkfun/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_rp2040.dts b/boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_rp2040.dts
similarity index 100%
rename from boards/sparkfun/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_rp2040.dts
rename to boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_rp2040.dts
diff --git a/boards/sparkfun/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_rp2040.yaml b/boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_rp2040.yaml
similarity index 100%
rename from boards/sparkfun/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_rp2040.yaml
rename to boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_rp2040.yaml
diff --git a/boards/sparkfun/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_rp2040_defconfig b/boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_rp2040_defconfig
similarity index 100%
rename from boards/sparkfun/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_rp2040_defconfig
rename to boards/sparkfun/pro_micro_rp2040/sparkfun_pro_micro_rp2040_defconfig
diff --git a/boards/sparkfun/sparkfun_red_v_things_plus/Kconfig.defconfig b/boards/sparkfun/red_v_things_plus/Kconfig.defconfig
similarity index 100%
rename from boards/sparkfun/sparkfun_red_v_things_plus/Kconfig.defconfig
rename to boards/sparkfun/red_v_things_plus/Kconfig.defconfig
diff --git a/boards/sparkfun/sparkfun_red_v_things_plus/Kconfig.sparkfun_red_v_things_plus b/boards/sparkfun/red_v_things_plus/Kconfig.sparkfun_red_v_things_plus
similarity index 100%
rename from boards/sparkfun/sparkfun_red_v_things_plus/Kconfig.sparkfun_red_v_things_plus
rename to boards/sparkfun/red_v_things_plus/Kconfig.sparkfun_red_v_things_plus
diff --git a/boards/sparkfun/sparkfun_red_v_things_plus/board.cmake b/boards/sparkfun/red_v_things_plus/board.cmake
similarity index 100%
rename from boards/sparkfun/sparkfun_red_v_things_plus/board.cmake
rename to boards/sparkfun/red_v_things_plus/board.cmake
diff --git a/boards/sparkfun/sparkfun_red_v_things_plus/board.yml b/boards/sparkfun/red_v_things_plus/board.yml
similarity index 100%
rename from boards/sparkfun/sparkfun_red_v_things_plus/board.yml
rename to boards/sparkfun/red_v_things_plus/board.yml
diff --git a/boards/sparkfun/sparkfun_red_v_things_plus/doc/img/sparkfun_red_v_things_plus.jpg b/boards/sparkfun/red_v_things_plus/doc/img/sparkfun_red_v_things_plus.jpg
similarity index 100%
rename from boards/sparkfun/sparkfun_red_v_things_plus/doc/img/sparkfun_red_v_things_plus.jpg
rename to boards/sparkfun/red_v_things_plus/doc/img/sparkfun_red_v_things_plus.jpg
diff --git a/boards/sparkfun/sparkfun_red_v_things_plus/doc/index.rst b/boards/sparkfun/red_v_things_plus/doc/index.rst
similarity index 100%
rename from boards/sparkfun/sparkfun_red_v_things_plus/doc/index.rst
rename to boards/sparkfun/red_v_things_plus/doc/index.rst
diff --git a/boards/sparkfun/sparkfun_red_v_things_plus/sparkfun_red_v_things_plus-pinctrl.dtsi b/boards/sparkfun/red_v_things_plus/sparkfun_red_v_things_plus-pinctrl.dtsi
similarity index 100%
rename from boards/sparkfun/sparkfun_red_v_things_plus/sparkfun_red_v_things_plus-pinctrl.dtsi
rename to boards/sparkfun/red_v_things_plus/sparkfun_red_v_things_plus-pinctrl.dtsi
diff --git a/boards/sparkfun/sparkfun_red_v_things_plus/sparkfun_red_v_things_plus.dts b/boards/sparkfun/red_v_things_plus/sparkfun_red_v_things_plus.dts
similarity index 100%
rename from boards/sparkfun/sparkfun_red_v_things_plus/sparkfun_red_v_things_plus.dts
rename to boards/sparkfun/red_v_things_plus/sparkfun_red_v_things_plus.dts
diff --git a/boards/sparkfun/sparkfun_red_v_things_plus/sparkfun_red_v_things_plus.yaml b/boards/sparkfun/red_v_things_plus/sparkfun_red_v_things_plus.yaml
similarity index 100%
rename from boards/sparkfun/sparkfun_red_v_things_plus/sparkfun_red_v_things_plus.yaml
rename to boards/sparkfun/red_v_things_plus/sparkfun_red_v_things_plus.yaml
diff --git a/boards/sparkfun/sparkfun_red_v_things_plus/sparkfun_red_v_things_plus_defconfig b/boards/sparkfun/red_v_things_plus/sparkfun_red_v_things_plus_defconfig
similarity index 100%
rename from boards/sparkfun/sparkfun_red_v_things_plus/sparkfun_red_v_things_plus_defconfig
rename to boards/sparkfun/red_v_things_plus/sparkfun_red_v_things_plus_defconfig
diff --git a/boards/sparkfun/sparkfun_thing_plus/Kconfig b/boards/sparkfun/thing_plus/Kconfig
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/Kconfig
rename to boards/sparkfun/thing_plus/Kconfig
diff --git a/boards/sparkfun/sparkfun_thing_plus/Kconfig.defconfig b/boards/sparkfun/thing_plus/Kconfig.defconfig
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/Kconfig.defconfig
rename to boards/sparkfun/thing_plus/Kconfig.defconfig
diff --git a/boards/sparkfun/sparkfun_thing_plus/Kconfig.sparkfun_thing_plus b/boards/sparkfun/thing_plus/Kconfig.sparkfun_thing_plus
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/Kconfig.sparkfun_thing_plus
rename to boards/sparkfun/thing_plus/Kconfig.sparkfun_thing_plus
diff --git a/boards/sparkfun/sparkfun_thing_plus/board.cmake b/boards/sparkfun/thing_plus/board.cmake
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/board.cmake
rename to boards/sparkfun/thing_plus/board.cmake
diff --git a/boards/sparkfun/sparkfun_thing_plus/board.yml b/boards/sparkfun/thing_plus/board.yml
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/board.yml
rename to boards/sparkfun/thing_plus/board.yml
diff --git a/boards/sparkfun/sparkfun_thing_plus/doc/img/sparkfun_thing_plus_nrf9160.jpg b/boards/sparkfun/thing_plus/doc/img/sparkfun_thing_plus_nrf9160.jpg
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/doc/img/sparkfun_thing_plus_nrf9160.jpg
rename to boards/sparkfun/thing_plus/doc/img/sparkfun_thing_plus_nrf9160.jpg
diff --git a/boards/sparkfun/sparkfun_thing_plus/doc/index.rst b/boards/sparkfun/thing_plus/doc/index.rst
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/doc/index.rst
rename to boards/sparkfun/thing_plus/doc/index.rst
diff --git a/boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160.dts b/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160.dts
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160.dts
rename to boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160.dts
diff --git a/boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160.yaml b/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160.yaml
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160.yaml
rename to boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160.yaml
diff --git a/boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160_common-pinctrl.dtsi b/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_common-pinctrl.dtsi
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160_common-pinctrl.dtsi
rename to boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_common-pinctrl.dtsi
diff --git a/boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160_common.dtsi b/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_common.dtsi
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160_common.dtsi
rename to boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_common.dtsi
diff --git a/boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160_defconfig b/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_defconfig
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160_defconfig
rename to boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_defconfig
diff --git a/boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160_ns.dts b/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_ns.dts
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160_ns.dts
rename to boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_ns.dts
diff --git a/boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160_ns.yaml b/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_ns.yaml
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160_ns.yaml
rename to boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_ns.yaml
diff --git a/boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160_ns_defconfig b/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_ns_defconfig
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160_ns_defconfig
rename to boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_ns_defconfig
diff --git a/boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160_partition_conf.dtsi b/boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_partition_conf.dtsi
similarity index 100%
rename from boards/sparkfun/sparkfun_thing_plus/sparkfun_thing_plus_nrf9160_partition_conf.dtsi
rename to boards/sparkfun/thing_plus/sparkfun_thing_plus_nrf9160_partition_conf.dtsi