diff --git a/boards/actinius/actinius_icarus/CMakeLists.txt b/boards/actinius/icarus/CMakeLists.txt
similarity index 100%
rename from boards/actinius/actinius_icarus/CMakeLists.txt
rename to boards/actinius/icarus/CMakeLists.txt
diff --git a/boards/actinius/actinius_icarus/Kconfig.actinius_icarus b/boards/actinius/icarus/Kconfig.actinius_icarus
similarity index 100%
rename from boards/actinius/actinius_icarus/Kconfig.actinius_icarus
rename to boards/actinius/icarus/Kconfig.actinius_icarus
diff --git a/boards/actinius/actinius_icarus/Kconfig.defconfig b/boards/actinius/icarus/Kconfig.defconfig
similarity index 100%
rename from boards/actinius/actinius_icarus/Kconfig.defconfig
rename to boards/actinius/icarus/Kconfig.defconfig
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_common-pinctrl.dtsi b/boards/actinius/icarus/actinius_icarus_common-pinctrl.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_common-pinctrl.dtsi
rename to boards/actinius/icarus/actinius_icarus_common-pinctrl.dtsi
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_common.dtsi b/boards/actinius/icarus/actinius_icarus_common.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_common.dtsi
rename to boards/actinius/icarus/actinius_icarus_common.dtsi
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_common_1_4_0.dtsi b/boards/actinius/icarus/actinius_icarus_common_1_4_0.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_common_1_4_0.dtsi
rename to boards/actinius/icarus/actinius_icarus_common_1_4_0.dtsi
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_common_2_0_0.dtsi b/boards/actinius/icarus/actinius_icarus_common_2_0_0.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_common_2_0_0.dtsi
rename to boards/actinius/icarus/actinius_icarus_common_2_0_0.dtsi
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_defconfig b/boards/actinius/icarus/actinius_icarus_defconfig
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_defconfig
rename to boards/actinius/icarus/actinius_icarus_defconfig
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_nrf9160.dts b/boards/actinius/icarus/actinius_icarus_nrf9160.dts
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_nrf9160.dts
rename to boards/actinius/icarus/actinius_icarus_nrf9160.dts
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_nrf9160.yaml b/boards/actinius/icarus/actinius_icarus_nrf9160.yaml
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_nrf9160.yaml
rename to boards/actinius/icarus/actinius_icarus_nrf9160.yaml
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_1_4_0.overlay b/boards/actinius/icarus/actinius_icarus_nrf9160_1_4_0.overlay
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_nrf9160_1_4_0.overlay
rename to boards/actinius/icarus/actinius_icarus_nrf9160_1_4_0.overlay
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_2_0_0.overlay b/boards/actinius/icarus/actinius_icarus_nrf9160_2_0_0.overlay
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_nrf9160_2_0_0.overlay
rename to boards/actinius/icarus/actinius_icarus_nrf9160_2_0_0.overlay
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns.dts b/boards/actinius/icarus/actinius_icarus_nrf9160_ns.dts
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns.dts
rename to boards/actinius/icarus/actinius_icarus_nrf9160_ns.dts
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns.yaml b/boards/actinius/icarus/actinius_icarus_nrf9160_ns.yaml
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns.yaml
rename to boards/actinius/icarus/actinius_icarus_nrf9160_ns.yaml
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_1_4_0.overlay b/boards/actinius/icarus/actinius_icarus_nrf9160_ns_1_4_0.overlay
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_1_4_0.overlay
rename to boards/actinius/icarus/actinius_icarus_nrf9160_ns_1_4_0.overlay
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_2_0_0.overlay b/boards/actinius/icarus/actinius_icarus_nrf9160_ns_2_0_0.overlay
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_2_0_0.overlay
rename to boards/actinius/icarus/actinius_icarus_nrf9160_ns_2_0_0.overlay
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_defconfig b/boards/actinius/icarus/actinius_icarus_nrf9160_ns_defconfig
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_nrf9160_ns_defconfig
rename to boards/actinius/icarus/actinius_icarus_nrf9160_ns_defconfig
diff --git a/boards/actinius/actinius_icarus/actinius_icarus_partition_conf.dtsi b/boards/actinius/icarus/actinius_icarus_partition_conf.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus/actinius_icarus_partition_conf.dtsi
rename to boards/actinius/icarus/actinius_icarus_partition_conf.dtsi
diff --git a/boards/actinius/actinius_icarus/board.cmake b/boards/actinius/icarus/board.cmake
similarity index 100%
rename from boards/actinius/actinius_icarus/board.cmake
rename to boards/actinius/icarus/board.cmake
diff --git a/boards/actinius/actinius_icarus/board.yml b/boards/actinius/icarus/board.yml
similarity index 100%
rename from boards/actinius/actinius_icarus/board.yml
rename to boards/actinius/icarus/board.yml
diff --git a/boards/actinius/actinius_icarus/doc/img/Icarus_front.jpg b/boards/actinius/icarus/doc/img/Icarus_front.jpg
similarity index 100%
rename from boards/actinius/actinius_icarus/doc/img/Icarus_front.jpg
rename to boards/actinius/icarus/doc/img/Icarus_front.jpg
diff --git a/boards/actinius/actinius_icarus/doc/img/Icarus_pinouts.jpg b/boards/actinius/icarus/doc/img/Icarus_pinouts.jpg
similarity index 100%
rename from boards/actinius/actinius_icarus/doc/img/Icarus_pinouts.jpg
rename to boards/actinius/icarus/doc/img/Icarus_pinouts.jpg
diff --git a/boards/actinius/actinius_icarus/doc/index.rst b/boards/actinius/icarus/doc/index.rst
similarity index 100%
rename from boards/actinius/actinius_icarus/doc/index.rst
rename to boards/actinius/icarus/doc/index.rst
diff --git a/boards/actinius/actinius_icarus/dts/bindings/actinius-charger-enable.yaml b/boards/actinius/icarus/dts/bindings/actinius-charger-enable.yaml
similarity index 100%
rename from boards/actinius/actinius_icarus/dts/bindings/actinius-charger-enable.yaml
rename to boards/actinius/icarus/dts/bindings/actinius-charger-enable.yaml
diff --git a/boards/actinius/actinius_icarus/dts/bindings/actinius-sim-select.yaml b/boards/actinius/icarus/dts/bindings/actinius-sim-select.yaml
similarity index 100%
rename from boards/actinius/actinius_icarus/dts/bindings/actinius-sim-select.yaml
rename to boards/actinius/icarus/dts/bindings/actinius-sim-select.yaml
diff --git a/boards/actinius/actinius_icarus/feather_connector.dtsi b/boards/actinius/icarus/feather_connector.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus/feather_connector.dtsi
rename to boards/actinius/icarus/feather_connector.dtsi
diff --git a/boards/actinius/actinius_icarus/pre_dt_board.cmake b/boards/actinius/icarus/pre_dt_board.cmake
similarity index 100%
rename from boards/actinius/actinius_icarus/pre_dt_board.cmake
rename to boards/actinius/icarus/pre_dt_board.cmake
diff --git a/boards/actinius/actinius_icarus_bee/CMakeLists.txt b/boards/actinius/icarus_bee/CMakeLists.txt
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/CMakeLists.txt
rename to boards/actinius/icarus_bee/CMakeLists.txt
diff --git a/boards/actinius/actinius_icarus_bee/Kconfig.actinius_icarus_bee b/boards/actinius/icarus_bee/Kconfig.actinius_icarus_bee
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/Kconfig.actinius_icarus_bee
rename to boards/actinius/icarus_bee/Kconfig.actinius_icarus_bee
diff --git a/boards/actinius/actinius_icarus_bee/Kconfig.defconfig b/boards/actinius/icarus_bee/Kconfig.defconfig
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/Kconfig.defconfig
rename to boards/actinius/icarus_bee/Kconfig.defconfig
diff --git a/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_common-pinctrl.dtsi b/boards/actinius/icarus_bee/actinius_icarus_bee_common-pinctrl.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/actinius_icarus_bee_common-pinctrl.dtsi
rename to boards/actinius/icarus_bee/actinius_icarus_bee_common-pinctrl.dtsi
diff --git a/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_common.dtsi b/boards/actinius/icarus_bee/actinius_icarus_bee_common.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/actinius_icarus_bee_common.dtsi
rename to boards/actinius/icarus_bee/actinius_icarus_bee_common.dtsi
diff --git a/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_defconfig b/boards/actinius/icarus_bee/actinius_icarus_bee_defconfig
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/actinius_icarus_bee_defconfig
rename to boards/actinius/icarus_bee/actinius_icarus_bee_defconfig
diff --git a/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160.dts b/boards/actinius/icarus_bee/actinius_icarus_bee_nrf9160.dts
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160.dts
rename to boards/actinius/icarus_bee/actinius_icarus_bee_nrf9160.dts
diff --git a/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160.yaml b/boards/actinius/icarus_bee/actinius_icarus_bee_nrf9160.yaml
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160.yaml
rename to boards/actinius/icarus_bee/actinius_icarus_bee_nrf9160.yaml
diff --git a/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns.dts b/boards/actinius/icarus_bee/actinius_icarus_bee_nrf9160_ns.dts
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns.dts
rename to boards/actinius/icarus_bee/actinius_icarus_bee_nrf9160_ns.dts
diff --git a/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns.yaml b/boards/actinius/icarus_bee/actinius_icarus_bee_nrf9160_ns.yaml
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns.yaml
rename to boards/actinius/icarus_bee/actinius_icarus_bee_nrf9160_ns.yaml
diff --git a/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns_defconfig b/boards/actinius/icarus_bee/actinius_icarus_bee_nrf9160_ns_defconfig
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/actinius_icarus_bee_nrf9160_ns_defconfig
rename to boards/actinius/icarus_bee/actinius_icarus_bee_nrf9160_ns_defconfig
diff --git a/boards/actinius/actinius_icarus_bee/actinius_icarus_bee_partition_conf.dtsi b/boards/actinius/icarus_bee/actinius_icarus_bee_partition_conf.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/actinius_icarus_bee_partition_conf.dtsi
rename to boards/actinius/icarus_bee/actinius_icarus_bee_partition_conf.dtsi
diff --git a/boards/actinius/actinius_icarus_bee/board.cmake b/boards/actinius/icarus_bee/board.cmake
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/board.cmake
rename to boards/actinius/icarus_bee/board.cmake
diff --git a/boards/actinius/actinius_icarus_bee/board.yml b/boards/actinius/icarus_bee/board.yml
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/board.yml
rename to boards/actinius/icarus_bee/board.yml
diff --git a/boards/actinius/actinius_icarus_bee/doc/img/icarus-bee-external-pins.jpg b/boards/actinius/icarus_bee/doc/img/icarus-bee-external-pins.jpg
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/doc/img/icarus-bee-external-pins.jpg
rename to boards/actinius/icarus_bee/doc/img/icarus-bee-external-pins.jpg
diff --git a/boards/actinius/actinius_icarus_bee/doc/img/icarus-bee-peripherals-pins.jpg b/boards/actinius/icarus_bee/doc/img/icarus-bee-peripherals-pins.jpg
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/doc/img/icarus-bee-peripherals-pins.jpg
rename to boards/actinius/icarus_bee/doc/img/icarus-bee-peripherals-pins.jpg
diff --git a/boards/actinius/actinius_icarus_bee/doc/img/icarus-bee.jpg b/boards/actinius/icarus_bee/doc/img/icarus-bee.jpg
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/doc/img/icarus-bee.jpg
rename to boards/actinius/icarus_bee/doc/img/icarus-bee.jpg
diff --git a/boards/actinius/actinius_icarus_bee/doc/index.rst b/boards/actinius/icarus_bee/doc/index.rst
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/doc/index.rst
rename to boards/actinius/icarus_bee/doc/index.rst
diff --git a/boards/actinius/actinius_icarus_bee/dts/bindings/actinius-sim-select.yaml b/boards/actinius/icarus_bee/dts/bindings/actinius-sim-select.yaml
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/dts/bindings/actinius-sim-select.yaml
rename to boards/actinius/icarus_bee/dts/bindings/actinius-sim-select.yaml
diff --git a/boards/actinius/actinius_icarus_bee/pre_dt_board.cmake b/boards/actinius/icarus_bee/pre_dt_board.cmake
similarity index 100%
rename from boards/actinius/actinius_icarus_bee/pre_dt_board.cmake
rename to boards/actinius/icarus_bee/pre_dt_board.cmake
diff --git a/boards/actinius/actinius_icarus_som/CMakeLists.txt b/boards/actinius/icarus_som/CMakeLists.txt
similarity index 100%
rename from boards/actinius/actinius_icarus_som/CMakeLists.txt
rename to boards/actinius/icarus_som/CMakeLists.txt
diff --git a/boards/actinius/actinius_icarus_som/Kconfig.actinius_icarus_som b/boards/actinius/icarus_som/Kconfig.actinius_icarus_som
similarity index 100%
rename from boards/actinius/actinius_icarus_som/Kconfig.actinius_icarus_som
rename to boards/actinius/icarus_som/Kconfig.actinius_icarus_som
diff --git a/boards/actinius/actinius_icarus_som/Kconfig.defconfig b/boards/actinius/icarus_som/Kconfig.defconfig
similarity index 100%
rename from boards/actinius/actinius_icarus_som/Kconfig.defconfig
rename to boards/actinius/icarus_som/Kconfig.defconfig
diff --git a/boards/actinius/actinius_icarus_som/actinius_icarus_som_common-pinctrl.dtsi b/boards/actinius/icarus_som/actinius_icarus_som_common-pinctrl.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus_som/actinius_icarus_som_common-pinctrl.dtsi
rename to boards/actinius/icarus_som/actinius_icarus_som_common-pinctrl.dtsi
diff --git a/boards/actinius/actinius_icarus_som/actinius_icarus_som_common.dtsi b/boards/actinius/icarus_som/actinius_icarus_som_common.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus_som/actinius_icarus_som_common.dtsi
rename to boards/actinius/icarus_som/actinius_icarus_som_common.dtsi
diff --git a/boards/actinius/actinius_icarus_som/actinius_icarus_som_defconfig b/boards/actinius/icarus_som/actinius_icarus_som_defconfig
similarity index 100%
rename from boards/actinius/actinius_icarus_som/actinius_icarus_som_defconfig
rename to boards/actinius/icarus_som/actinius_icarus_som_defconfig
diff --git a/boards/actinius/actinius_icarus_som/actinius_icarus_som_nrf9160.dts b/boards/actinius/icarus_som/actinius_icarus_som_nrf9160.dts
similarity index 100%
rename from boards/actinius/actinius_icarus_som/actinius_icarus_som_nrf9160.dts
rename to boards/actinius/icarus_som/actinius_icarus_som_nrf9160.dts
diff --git a/boards/actinius/actinius_icarus_som/actinius_icarus_som_nrf9160.yaml b/boards/actinius/icarus_som/actinius_icarus_som_nrf9160.yaml
similarity index 100%
rename from boards/actinius/actinius_icarus_som/actinius_icarus_som_nrf9160.yaml
rename to boards/actinius/icarus_som/actinius_icarus_som_nrf9160.yaml
diff --git a/boards/actinius/actinius_icarus_som/actinius_icarus_som_nrf9160_ns.dts b/boards/actinius/icarus_som/actinius_icarus_som_nrf9160_ns.dts
similarity index 100%
rename from boards/actinius/actinius_icarus_som/actinius_icarus_som_nrf9160_ns.dts
rename to boards/actinius/icarus_som/actinius_icarus_som_nrf9160_ns.dts
diff --git a/boards/actinius/actinius_icarus_som/actinius_icarus_som_nrf9160_ns.yaml b/boards/actinius/icarus_som/actinius_icarus_som_nrf9160_ns.yaml
similarity index 100%
rename from boards/actinius/actinius_icarus_som/actinius_icarus_som_nrf9160_ns.yaml
rename to boards/actinius/icarus_som/actinius_icarus_som_nrf9160_ns.yaml
diff --git a/boards/actinius/actinius_icarus_som/actinius_icarus_som_nrf9160_ns_defconfig b/boards/actinius/icarus_som/actinius_icarus_som_nrf9160_ns_defconfig
similarity index 100%
rename from boards/actinius/actinius_icarus_som/actinius_icarus_som_nrf9160_ns_defconfig
rename to boards/actinius/icarus_som/actinius_icarus_som_nrf9160_ns_defconfig
diff --git a/boards/actinius/actinius_icarus_som/actinius_icarus_som_partition_conf.dtsi b/boards/actinius/icarus_som/actinius_icarus_som_partition_conf.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus_som/actinius_icarus_som_partition_conf.dtsi
rename to boards/actinius/icarus_som/actinius_icarus_som_partition_conf.dtsi
diff --git a/boards/actinius/actinius_icarus_som/board.cmake b/boards/actinius/icarus_som/board.cmake
similarity index 100%
rename from boards/actinius/actinius_icarus_som/board.cmake
rename to boards/actinius/icarus_som/board.cmake
diff --git a/boards/actinius/actinius_icarus_som/board.yml b/boards/actinius/icarus_som/board.yml
similarity index 100%
rename from boards/actinius/actinius_icarus_som/board.yml
rename to boards/actinius/icarus_som/board.yml
diff --git a/boards/actinius/actinius_icarus_som/doc/img/icarus-som-external-pins.jpg b/boards/actinius/icarus_som/doc/img/icarus-som-external-pins.jpg
similarity index 100%
rename from boards/actinius/actinius_icarus_som/doc/img/icarus-som-external-pins.jpg
rename to boards/actinius/icarus_som/doc/img/icarus-som-external-pins.jpg
diff --git a/boards/actinius/actinius_icarus_som/doc/img/icarus-som-peripherals-pins.jpg b/boards/actinius/icarus_som/doc/img/icarus-som-peripherals-pins.jpg
similarity index 100%
rename from boards/actinius/actinius_icarus_som/doc/img/icarus-som-peripherals-pins.jpg
rename to boards/actinius/icarus_som/doc/img/icarus-som-peripherals-pins.jpg
diff --git a/boards/actinius/actinius_icarus_som/doc/img/icarus-som.jpg b/boards/actinius/icarus_som/doc/img/icarus-som.jpg
similarity index 100%
rename from boards/actinius/actinius_icarus_som/doc/img/icarus-som.jpg
rename to boards/actinius/icarus_som/doc/img/icarus-som.jpg
diff --git a/boards/actinius/actinius_icarus_som/doc/index.rst b/boards/actinius/icarus_som/doc/index.rst
similarity index 100%
rename from boards/actinius/actinius_icarus_som/doc/index.rst
rename to boards/actinius/icarus_som/doc/index.rst
diff --git a/boards/actinius/actinius_icarus_som/dts/bindings/actinius-sim-select.yaml b/boards/actinius/icarus_som/dts/bindings/actinius-sim-select.yaml
similarity index 100%
rename from boards/actinius/actinius_icarus_som/dts/bindings/actinius-sim-select.yaml
rename to boards/actinius/icarus_som/dts/bindings/actinius-sim-select.yaml
diff --git a/boards/actinius/actinius_icarus_som/pre_dt_board.cmake b/boards/actinius/icarus_som/pre_dt_board.cmake
similarity index 100%
rename from boards/actinius/actinius_icarus_som/pre_dt_board.cmake
rename to boards/actinius/icarus_som/pre_dt_board.cmake
diff --git a/boards/actinius/actinius_icarus_som_dk/CMakeLists.txt b/boards/actinius/icarus_som_dk/CMakeLists.txt
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/CMakeLists.txt
rename to boards/actinius/icarus_som_dk/CMakeLists.txt
diff --git a/boards/actinius/actinius_icarus_som_dk/Kconfig.actinius_icarus_som_dk b/boards/actinius/icarus_som_dk/Kconfig.actinius_icarus_som_dk
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/Kconfig.actinius_icarus_som_dk
rename to boards/actinius/icarus_som_dk/Kconfig.actinius_icarus_som_dk
diff --git a/boards/actinius/actinius_icarus_som_dk/Kconfig.defconfig b/boards/actinius/icarus_som_dk/Kconfig.defconfig
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/Kconfig.defconfig
rename to boards/actinius/icarus_som_dk/Kconfig.defconfig
diff --git a/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_common-pinctrl.dtsi b/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_common-pinctrl.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_common-pinctrl.dtsi
rename to boards/actinius/icarus_som_dk/actinius_icarus_som_dk_common-pinctrl.dtsi
diff --git a/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_common.dtsi b/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_common.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_common.dtsi
rename to boards/actinius/icarus_som_dk/actinius_icarus_som_dk_common.dtsi
diff --git a/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_defconfig b/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_defconfig
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_defconfig
rename to boards/actinius/icarus_som_dk/actinius_icarus_som_dk_defconfig
diff --git a/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160.dts b/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_nrf9160.dts
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160.dts
rename to boards/actinius/icarus_som_dk/actinius_icarus_som_dk_nrf9160.dts
diff --git a/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160.yaml b/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_nrf9160.yaml
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160.yaml
rename to boards/actinius/icarus_som_dk/actinius_icarus_som_dk_nrf9160.yaml
diff --git a/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns.dts b/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns.dts
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns.dts
rename to boards/actinius/icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns.dts
diff --git a/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns.yaml b/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns.yaml
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns.yaml
rename to boards/actinius/icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns.yaml
diff --git a/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns_defconfig b/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns_defconfig
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns_defconfig
rename to boards/actinius/icarus_som_dk/actinius_icarus_som_dk_nrf9160_ns_defconfig
diff --git a/boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_partition_conf.dtsi b/boards/actinius/icarus_som_dk/actinius_icarus_som_dk_partition_conf.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/actinius_icarus_som_dk_partition_conf.dtsi
rename to boards/actinius/icarus_som_dk/actinius_icarus_som_dk_partition_conf.dtsi
diff --git a/boards/actinius/actinius_icarus_som_dk/arduino_connector.dtsi b/boards/actinius/icarus_som_dk/arduino_connector.dtsi
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/arduino_connector.dtsi
rename to boards/actinius/icarus_som_dk/arduino_connector.dtsi
diff --git a/boards/actinius/actinius_icarus_som_dk/board.cmake b/boards/actinius/icarus_som_dk/board.cmake
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/board.cmake
rename to boards/actinius/icarus_som_dk/board.cmake
diff --git a/boards/actinius/actinius_icarus_som_dk/board.yml b/boards/actinius/icarus_som_dk/board.yml
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/board.yml
rename to boards/actinius/icarus_som_dk/board.yml
diff --git a/boards/actinius/actinius_icarus_som_dk/doc/img/icarus-som-dk-block-diagram.jpg b/boards/actinius/icarus_som_dk/doc/img/icarus-som-dk-block-diagram.jpg
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/doc/img/icarus-som-dk-block-diagram.jpg
rename to boards/actinius/icarus_som_dk/doc/img/icarus-som-dk-block-diagram.jpg
diff --git a/boards/actinius/actinius_icarus_som_dk/doc/img/icarus-som-dk.jpg b/boards/actinius/icarus_som_dk/doc/img/icarus-som-dk.jpg
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/doc/img/icarus-som-dk.jpg
rename to boards/actinius/icarus_som_dk/doc/img/icarus-som-dk.jpg
diff --git a/boards/actinius/actinius_icarus_som_dk/doc/index.rst b/boards/actinius/icarus_som_dk/doc/index.rst
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/doc/index.rst
rename to boards/actinius/icarus_som_dk/doc/index.rst
diff --git a/boards/actinius/actinius_icarus_som_dk/dts/bindings/actinius-sim-select.yaml b/boards/actinius/icarus_som_dk/dts/bindings/actinius-sim-select.yaml
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/dts/bindings/actinius-sim-select.yaml
rename to boards/actinius/icarus_som_dk/dts/bindings/actinius-sim-select.yaml
diff --git a/boards/actinius/actinius_icarus_som_dk/pre_dt_board.cmake b/boards/actinius/icarus_som_dk/pre_dt_board.cmake
similarity index 100%
rename from boards/actinius/actinius_icarus_som_dk/pre_dt_board.cmake
rename to boards/actinius/icarus_som_dk/pre_dt_board.cmake