diff --git a/package.json b/package.json
index 1878ddb..130e294 100644
--- a/package.json
+++ b/package.json
@@ -51,242 +51,242 @@
           "assets": [
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug-*/merged.hex",
-              "name": "thingy_world-Thingy91-debug-${nextRelease.gitTag}.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug.hex",
               "label": "App with Bootloader HEX file for Thingy:91 (debug)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug-*/app_signed.hex",
-              "name": "thingy_world-Thingy91-debug-${nextRelease.gitTag}-signed.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug-signed.hex",
               "label": "Firmware Update Image HEX file for Thingy:91 (debug)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug-*/app_update.bin",
-              "name": "thingy_world-Thingy91-debug-${nextRelease.gitTag}-app_update.bin",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug-app_update.bin",
               "label": "Firmware Update Image BIN file for Thingy:91 (debug)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug-*/zephyr.elf",
-              "name": "thingy_world-Thingy91-debug-${nextRelease.gitTag}.elf",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug.elf",
               "label": "App Symbols ELF file for Thingy:91 firmware (debug)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug.nbiot-*/merged.hex",
-              "name": "thingy_world-Thingy91-debug-nbiot-${nextRelease.gitTag}.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug-nbiot.hex",
               "label": "App with Bootloader HEX file for Thingy:91 (debug, NB-IoT only)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug.nbiot-*/app_signed.hex",
-              "name": "thingy_world-Thingy91-debug-nbiot-${nextRelease.gitTag}-signed.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug-nbiot-signed.hex",
               "label": "Firmware Update Image HEX file for Thingy:91 (debug, NB-IoT only)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug.nbiot-*/app_update.bin",
-              "name": "thingy_world-Thingy91-debug-nbiot-${nextRelease.gitTag}-app_update.bin",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug-nbiot-app_update.bin",
               "label": "Firmware Update Image BIN file for Thingy:91 (debug, NB-IoT only)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug.nbiot-*/zephyr.elf",
-              "name": "thingy_world-Thingy91-debug-nbiot-${nextRelease.gitTag}.elf",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug-nbiot.elf",
               "label": "App Symbols ELF file for Thingy:91 firmware (debug, NB-IoT only)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug.nbiot.legacy_pco-*/merged.hex",
-              "name": "thingy_world-Thingy91-debug-nbiot-legacy-pco-${nextRelease.gitTag}.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug-nbiot-legacy-pco.hex",
               "label": "App with Bootloader HEX file for Thingy:91 (debug, NB-IoT only, legacy PCO)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug.nbiot.legacy_pco-*/app_signed.hex",
-              "name": "thingy_world-Thingy91-debug-nbiot-legacy-pco${nextRelease.gitTag}-signed.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug-nbiot-legacy-pco${nextRelease.gitTag}-signed.hex",
               "label": "Firmware Update Image HEX file for Thingy:91 (debug, NB-IoT only, legacy PCO)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug.nbiot.legacy_pco-*/app_update.bin",
-              "name": "thingy_world-Thingy91-debug-nbiot-legacy-pco${nextRelease.gitTag}-app_update.bin",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug-nbiot-legacy-pco${nextRelease.gitTag}-app_update.bin",
               "label": "Firmware Update Image BIN file for Thingy:91 (debug, NB-IoT only, legacy PCO)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug.nbiot.legacy_pco-*/zephyr.elf",
-              "name": "thingy_world-Thingy91-debug-nbiot-legacy-pco${nextRelease.gitTag}.elf",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug-nbiot-legacy-pco${nextRelease.gitTag}.elf",
               "label": "App Symbols ELF file for Thingy:91 firmware (debug, NB-IoT only, legacy PCO)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/nrf9160dk.debug-*/merged.hex",
-              "name": "thingy_world-nRF9160DK-debug-${nextRelease.gitTag}.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-nRF9160DK-debug.hex",
               "label": "App with Bootloader HEX file for nRF9160 DK (debug)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.memfault-*/merged.hex",
-              "name": "thingy_world-Thingy91-low-power-${nextRelease.gitTag}.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power.hex",
               "label": "App with Bootloader HEX file for Thingy:91 (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.memfault-*/app_signed.hex",
-              "name": "thingy_world-Thingy91-low-power-${nextRelease.gitTag}-signed.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power-signed.hex",
               "label": "Firmware Update Image HEX file for Thingy:91 (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.memfault-*/app_update.bin",
-              "name": "thingy_world-Thingy91-low-power-${nextRelease.gitTag}-app_update.bin",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power-app_update.bin",
               "label": "Firmware Update Image BIN file for Thingy:91 (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.memfault-*/zephyr.elf",
-              "name": "thingy_world-Thingy91-low-power-${nextRelease.gitTag}.elf",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power.elf",
               "label": "App Symbols ELF file for Thingy:91 firmware (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.memfault.nbiot-*/merged.hex",
-              "name": "thingy_world-Thingy91-low-power-nbiot-${nextRelease.gitTag}.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power-nbiot.hex",
               "label": "App with Bootloader HEX file for Thingy:91 (low power, NB-IoT only)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.memfault.nbiot-*/app_signed.hex",
-              "name": "thingy_world-Thingy91-low-power-nbiot-${nextRelease.gitTag}-signed.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power-nbiot-signed.hex",
               "label": "Firmware Update Image HEX file for Thingy:91 (low power, NB-IoT only)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.memfault.nbiot-*/app_update.bin",
-              "name": "thingy_world-Thingy91-low-power-nbiot-${nextRelease.gitTag}-app_update.bin",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power-nbiot-app_update.bin",
               "label": "Firmware Update Image BIN file for Thingy:91 (low power, NB-IoT only)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.memfault.nbiot-*/zephyr.elf",
-              "name": "thingy_world-Thingy91-low-power-nbiot-${nextRelease.gitTag}.elf",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power-nbiot.elf",
               "label": "App Symbols ELF file for Thingy:91 firmware (low power, NB-IoT only)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.memfault.nbiot.legacy_pco-*/merged.hex",
-              "name": "thingy_world-Thingy91-low-power-nbiot-legacy-pco-${nextRelease.gitTag}.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power-nbiot-legacy-pco.hex",
               "label": "App with Bootloader HEX file for Thingy:91 (low power, NB-IoT only, legacy PCO)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.memfault.nbiot.legacy_pco-*/app_signed.hex",
-              "name": "thingy_world-Thingy91-low-power-nbiot-legacy-pco-${nextRelease.gitTag}-signed.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power-nbiot-legacy-pco-signed.hex",
               "label": "Firmware Update Image HEX file for Thingy:91 (low power, NB-IoT only, legacy PCO)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.memfault.nbiot.legacy_pco-*/app_update.bin",
-              "name": "thingy_world-Thingy91-low-power-nbiot-legacy-pco-${nextRelease.gitTag}-app_update.bin",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power-nbiot-legacy-pco-app_update.bin",
               "label": "Firmware Update Image BIN file for Thingy:91 (low power, NB-IoT only, legacy PCO)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.memfault.nbiot.legacy_pco-*/zephyr.elf",
-              "name": "thingy_world-Thingy91-low-power-nbiot-legacy-pco-${nextRelease.gitTag}.elf",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power-nbiot-legacy-pco.elf",
               "label": "App Symbols ELF file for Thingy:91 firmware (low power, NB-IoT only, legacy PCO)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/nrf9160dk.debug-*/app_signed.hex",
-              "name": "thingy_world-nRF9160DK-debug-${nextRelease.gitTag}-signed.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-nRF9160DK-debug-signed.hex",
               "label": "Firmware Update Image HEX file for nRF9160 DK (debug)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/nrf9160dk.debug-*/app_update.bin",
-              "name": "thingy_world-nRF9160DK-debug-${nextRelease.gitTag}-app_update.bin",
+              "name": "thingy_world-${nextRelease.gitTag}-nRF9160DK-debug-app_update.bin",
               "label": "Firmware Update Image BIN file for nRF9160 DK (debug)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/nrf9160dk.debug-*/zephyr.elf",
-              "name": "thingy_world-nRF9160DK-debug-${nextRelease.gitTag}.elf",
+              "name": "thingy_world-${nextRelease.gitTag}-nRF9160DK-debug.elf",
               "label": "App Symbols ELF file for nRF9160 DK firmware (debug)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.solar.memfault-*/merged.hex",
-              "name": "thingy_world-Thingy91-low-power.solar-${nextRelease.gitTag}.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power.solar.hex",
               "label": "App with Bootloader HEX file for Thingy:91 with Solar Shield (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.solar.memfault-*/app_signed.hex",
-              "name": "thingy_world-Thingy91-low-power.solar-${nextRelease.gitTag}-signed.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power.solar-signed.hex",
               "label": "Firmware Update Image HEX file for Thingy:91 with Solar Shield (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.solar.memfault-*/app_update.bin",
-              "name": "thingy_world-Thingy91-low-power.solar-${nextRelease.gitTag}-app_update.bin",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power.solar-app_update.bin",
               "label": "Firmware Update Image BIN file for Thingy:91 with Solar Shield (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.low-power.solar.memfault-*/zephyr.elf",
-              "name": "thingy_world-Thingy91-low-power.solar-${nextRelease.gitTag}.elf",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-low-power.solar.elf",
               "label": "App Symbols ELF file for Thingy:91 with Solar Shield firmware (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug.solar-*/merged.hex",
-              "name": "thingy_world-Thingy91-debug.solar-${nextRelease.gitTag}.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug.solar.hex",
               "label": "App with Bootloader HEX file for Thingy:91 with Solar Shield (debug)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug.solar-*/app_signed.hex",
-              "name": "thingy_world-Thingy91-debug.solar-${nextRelease.gitTag}-signed.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug.solar-signed.hex",
               "label": "Firmware Update Image HEX file for Thingy:91 with Solar Shield (debug)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug.solar-*/app_update.bin",
-              "name": "thingy_world-Thingy91-debug.solar-${nextRelease.gitTag}-app_update.bin",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug.solar-app_update.bin",
               "label": "Firmware Update Image BIN file for Thingy:91 with Solar Shield (debug)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.debug.solar-*/zephyr.elf",
-              "name": "thingy_world-Thingy91-debug.solar-${nextRelease.gitTag}.elf",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91-debug.solar.elf",
               "label": "App Symbols ELF file for Thingy:91 with Solar Shield firmware (debug)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/nrf9160dk.low-power.memfault-*/merged.hex",
-              "name": "thingy_world-nRF9160DK-low-power-${nextRelease.gitTag}.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-nRF9160DK-low-power.hex",
               "label": "App with Bootloader HEX file for nRF9160 DK (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/nrf9160dk.low-power.memfault-*/app_signed.hex",
-              "name": "thingy_world-nRF9160DK-low-power-${nextRelease.gitTag}-signed.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-nRF9160DK-low-power-signed.hex",
               "label": "Firmware Update Image HEX file for nRF9160 DK (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/nrf9160dk.low-power.memfault-*/app_update.bin",
-              "name": "thingy_world-nRF9160DK-low-power-${nextRelease.gitTag}-app_update.bin",
+              "name": "thingy_world-${nextRelease.gitTag}-nRF9160DK-low-power-app_update.bin",
               "label": "Firmware Update Image BIN file for nRF9160 DK (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/nrf9160dk.low-power.memfault-*/zephyr.elf",
-              "name": "thingy_world-nRF9160DK-low-power-${nextRelease.gitTag}.elf",
+              "name": "thingy_world-${nextRelease.gitTag}-nRF9160DK-low-power.elf",
               "label": "App Symbols ELF file for nRF9160 DK firmware (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91x.low-power.wifi-*/merged.hex",
-              "name": "thingy_world-Thingy91X-low-power.wifi-${nextRelease.gitTag}.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91X-low-power.wifi.hex",
               "label": "App with Bootloader HEX file for Thingy:91 X with Wi-Fi (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91x.low-power.wifi-*/app_signed.hex",
-              "name": "thingy_world-Thingy91X-low-power.wifi-${nextRelease.gitTag}-signed.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91X-low-power.wifi-signed.hex",
               "label": "Firmware Update Image HEX file for Thingy:91 X with Wi-Fi (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91x.low-power.wifi-*/app_update.bin",
-              "name": "thingy_world-Thingy91X-low-power.wifi-${nextRelease.gitTag}-app_update.bin",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91X-low-power.wifi-app_update.bin",
               "label": "Firmware Update Image BIN file for Thingy:91 X with Wi-Fi (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91x.low-power.wifi-*/zephyr.elf",
-              "name": "thingy_world-Thingy91X-low-power.wifi-${nextRelease.gitTag}.elf",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91X-low-power.wifi.elf",
               "label": "App Symbols ELF file for Thingy:91 X with Wi-Fi firmware (low power)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91x.wifi-*/merged.hex",
-              "name": "thingy_world-Thingy91X-wifi-${nextRelease.gitTag}.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91X-wifi.hex",
               "label": "App with Bootloader HEX file for Thingy:91 X with Wi-Fi"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91x.wifi-*/app_signed.hex",
-              "name": "thingy_world-Thingy91X-wifi-${nextRelease.gitTag}-signed.hex",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91X-wifi-signed.hex",
               "label": "Firmware Update Image HEX file for Thingy:91 X with Wi-Fi (signed)"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91x.wifi-*/app_update.bin",
-              "name": "thingy_world-Thingy91X-wifi-${nextRelease.gitTag}-app_update.bin",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91X-wifi-app_update.bin",
               "label": "Firmware Update Image BIN file for Thingy:91 X with Wi-Fi"
             },
             {
               "path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91x.wifi-*/zephyr.elf",
-              "name": "thingy_world-Thingy91X-wifi-${nextRelease.gitTag}.elf",
+              "name": "thingy_world-${nextRelease.gitTag}-Thingy91X-wifi.elf",
               "label": "App Symbols ELF file for Thingy:91 X with Wi-Fi firmware"
             }
           ]