tests: Change duplicated names of the test cases

Some names of the test cases are duplicated within the project.
This commit contains the proposed names of the test scenarios.

Signed-off-by: Katarzyna Giadla <katarzyna.giadla@nordicsemi.no>
diff --git a/samples/bluetooth/direction_finding_central/sample.yaml b/samples/bluetooth/direction_finding_central/sample.yaml
index 838a58b..a2d6647 100644
--- a/samples/bluetooth/direction_finding_central/sample.yaml
+++ b/samples/bluetooth/direction_finding_central/sample.yaml
@@ -2,7 +2,7 @@
   name: Direction Finding Central
   description: Sample application showing central role of Direction Finding in connected mode
 tests:
-  sample.bluetooth.direction_finding_connectionless_rx:
+  sample.bluetooth.direction_finding.central:
     harness: bluetooth
     platform_allow: nrf52833dk_nrf52833 nrf52833dk_nrf52820 nrf5340dk_nrf5340_cpuapp
     tags: bluetooth
@@ -10,7 +10,7 @@
       - nrf52833dk_nrf52833
       - nrf52833dk_nrf52820
       - nrf5340dk_nrf5340_cpuapp
-  sample.bluetooth.direction_finding_connectionless_rx.aod:
+  sample.bluetooth.direction_finding.central.aod:
     harness: bluetooth
     extra_args: OVERLAY_CONFIG="overlay-aod.conf"
     platform_allow: nrf52833dk_nrf52833 nrf52833dk_nrf52820 nrf5340dk_nrf5340_cpuapp
diff --git a/samples/bluetooth/direction_finding_peripheral/sample.yaml b/samples/bluetooth/direction_finding_peripheral/sample.yaml
index 477c28c..8d200bb 100644
--- a/samples/bluetooth/direction_finding_peripheral/sample.yaml
+++ b/samples/bluetooth/direction_finding_peripheral/sample.yaml
@@ -2,7 +2,7 @@
   name: Direction Finding Peripheral
   description: Sample application showing peripheral role of Direction Finding in connected mode
 tests:
-  sample.bluetooth.direction_finding_connectionless_rx:
+  sample.bluetooth.direction_finding.peripheral:
     harness: bluetooth
     platform_allow: nrf52833dk_nrf52833 nrf52833dk_nrf52820 nrf5340dk_nrf5340_cpuapp
     tags: bluetooth
@@ -10,7 +10,7 @@
       - nrf52833dk_nrf52833
       - nrf52833dk_nrf52820
       - nrf5340dk_nrf5340_cpuapp
-  sample.bluetooth.direction_finding_connectionless_rx.aod:
+  sample.bluetooth.direction_finding.peripheral.aod:
     harness: bluetooth
     extra_args: OVERLAY_CONFIG="overlay-aoa.conf"
     platform_allow: nrf52833dk_nrf52833 nrf52833dk_nrf52820 nrf5340dk_nrf5340_cpuapp
diff --git a/samples/boards/esp32/spiram_test/sample.yaml b/samples/boards/esp32/spiram_test/sample.yaml
index 527874d..d8fa92d 100644
--- a/samples/boards/esp32/spiram_test/sample.yaml
+++ b/samples/boards/esp32/spiram_test/sample.yaml
@@ -2,6 +2,6 @@
   description: Application to test memory allocation from SPIRAM
   name: spiram_test
 tests:
-  sample.board.esp32:
+  sample.board.esp32.spiram:
     platform_allow: esp32
     tags: esp32
diff --git a/samples/boards/esp32/wifi_station/sample.yaml b/samples/boards/esp32/wifi_station/sample.yaml
index 32bc1d6..f242f9f 100644
--- a/samples/boards/esp32/wifi_station/sample.yaml
+++ b/samples/boards/esp32/wifi_station/sample.yaml
@@ -1,6 +1,6 @@
 sample:
   name: Espressif ESP32 WiFi Station
 tests:
-  sample.board.esp32:
+  sample.board.esp32.wifi_station:
     platform_allow: esp32 esp32s2_saola
     tags: esp32
diff --git a/samples/net/sockets/echo_client/sample.yaml b/samples/net/sockets/echo_client/sample.yaml
index 10ea0a5..7e7029e 100644
--- a/samples/net/sockets/echo_client/sample.yaml
+++ b/samples/net/sockets/echo_client/sample.yaml
@@ -14,22 +14,22 @@
   sample.net.sockets.echo_client.802154:
     extra_args: OVERLAY_CONFIG="overlay-qemu_802154.conf"
     platform_allow: qemu_x86
-  sample.net.sockets.echo_server.802154.rf2xx:
+  sample.net.sockets.echo_client.802154.rf2xx:
     extra_args: OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: atsamr21_xpro
-  sample.net.sockets.echo_server.802154.rf2xx.xplained:
+  sample.net.sockets.echo_client.802154.rf2xx.xplained:
     extra_args: SHIELD=atmel_rf2xx_xplained OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: sam4s_xplained
-  sample.net.sockets.echo_server.802154.rf2xx.xpro:
+  sample.net.sockets.echo_client.802154.rf2xx.xpro:
     extra_args: SHIELD=atmel_rf2xx_xpro OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: sam4e_xpro sam_v71_xult
-  sample.net.sockets.echo_server.802154.rf2xx.legacy:
+  sample.net.sockets.echo_client.802154.rf2xx.legacy:
     extra_args: SHIELD=atmel_rf2xx_legacy OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: sam4e_xpro sam_v71_xult
-  sample.net.sockets.echo_server.802154.rf2xx.arduino:
+  sample.net.sockets.echo_client.802154.rf2xx.arduino:
     extra_args: SHIELD=atmel_rf2xx_arduino OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: sam_v71_xult frdm_k64f nucleo_f767zi
-  sample.net.sockets.echo_server.802154.rf2xx.mikrobus:
+  sample.net.sockets.echo_client.802154.rf2xx.mikrobus:
     extra_args: SHIELD=atmel_rf2xx_mikrobus OVERLAY_CONFIG="overlay-802154.conf"
     platform_allow: lpcxpresso55s69_ns
   sample.net.sockets.echo_client.bt:
diff --git a/samples/subsys/display/lvgl/sample.yaml b/samples/subsys/display/lvgl/sample.yaml
index fb420c4..e1da096 100644
--- a/samples/subsys/display/lvgl/sample.yaml
+++ b/samples/subsys/display/lvgl/sample.yaml
@@ -2,11 +2,11 @@
   description: LVGL sample application
   name: lvgl
 tests:
-  sample.gui.lvgl:
+  sample.display.lvgl.gui:
     harness: display
     platform_allow: reel_board mimxrt1050_evk mimxrt1060_evk mimxrt1064_evk
     tags: samples display gui
-  sample.display.adafruit_2_8_tft_touch_v2:
+  sample.display.lvgl.adafruit_2_8_tft_touch_v2:
     depends_on: arduino_gpio arduino_i2c arduino_spi
     # Default settings end up allocating an ~150KB sized buffer in lvgl.
     # This adds a bit of buffer to that for other data.
@@ -17,15 +17,15 @@
     harness: console
     harness_config:
       fixture: fixture_shield_adafruit_2_8_tft_touch_v2
-  sample.display.waveshare_epaper_gdeh0213b1:
+  sample.display.lvgl.waveshare_epaper_gdeh0213b1:
     platform_allow: nrf52840dk_nrf52840
     extra_args: SHIELD=waveshare_epaper_gdeh0213b1
     tags: shield
-  sample.display.waveshare_epaper_gdeh0213b72:
+  sample.display.lvgl.waveshare_epaper_gdeh0213b72:
     platform_allow: nrf52840dk_nrf52840
     extra_args: SHIELD=waveshare_epaper_gdeh0213b72
     tags: shield
-  sample.display.waveshare_epaper_gdeh029a1:
+  sample.display.lvgl.waveshare_epaper_gdeh029a1:
     platform_allow: nrf52840dk_nrf52840
     extra_args: SHIELD=waveshare_epaper_gdeh029a1
     tags: shield
@@ -33,11 +33,11 @@
     build_only: true
     platform_allow: native_posix_64
     tags: samples display gui
-  sample.display.buydisplay_2_8_tft_touch_arduino:
+  sample.display.lvgl.buydisplay_2_8_tft_touch_arduino:
     platform_allow: nrf52840dk_nrf52840
     extra_args: SHIELD=buydisplay_2_8_tft_touch_arduino
     tags: shield
-  sample.display.dummy:
+  sample.display.lvgl.dummy:
     build_only: true
     platform_allow: native_posix native_posix_64
     extra_args: DTC_OVERLAY_FILE="dummy_dc.overlay"
diff --git a/tests/arch/x86/static_idt/testcase.yaml b/tests/arch/x86/static_idt/testcase.yaml
index d0b84fa..ae272c5 100644
--- a/tests/arch/x86/static_idt/testcase.yaml
+++ b/tests/arch/x86/static_idt/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  arch.interrupt.x86:
+  arch.x86.interrupt:
     arch_allow: x86
     filter: not CONFIG_X86_64
     tags: ignore_faults interrupt idt
diff --git a/tests/benchmarks/data_structure_perf/dlist_perf/testcase.yaml b/tests/benchmarks/data_structure_perf/dlist_perf/testcase.yaml
index 670b4d6..e207a76 100644
--- a/tests/benchmarks/data_structure_perf/dlist_perf/testcase.yaml
+++ b/tests/benchmarks/data_structure_perf/dlist_perf/testcase.yaml
@@ -1,3 +1,3 @@
 tests:
-  benchmark.data_structures:
+  benchmark.data_structure_perf.dlist:
     tags: benchmark dlist
diff --git a/tests/benchmarks/data_structure_perf/rbtree_perf/testcase.yaml b/tests/benchmarks/data_structure_perf/rbtree_perf/testcase.yaml
index 1697528..3cb7a6e 100644
--- a/tests/benchmarks/data_structure_perf/rbtree_perf/testcase.yaml
+++ b/tests/benchmarks/data_structure_perf/rbtree_perf/testcase.yaml
@@ -1,3 +1,3 @@
 tests:
-  benchmark.data_structures:
+  benchmark.data_structure_perf.rbtree:
     tags: benchmark rbtree
diff --git a/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml b/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
index 5211bac..2cb94e1 100644
--- a/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
+++ b/tests/bluetooth/df/connectionless_cte_chains/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  bluetooth.df.conectionless_cte_tx:
+  bluetooth.df.connectionless_cte_chains:
     platform_allow: nrf52_bsim
     integration_platforms:
       - nrf52_bsim
diff --git a/tests/bluetooth/l2cap/testcase.yaml b/tests/bluetooth/l2cap/testcase.yaml
index 7e82ce1..8e0c313 100644
--- a/tests/bluetooth/l2cap/testcase.yaml
+++ b/tests/bluetooth/l2cap/testcase.yaml
@@ -1,4 +1,4 @@
 tests:
-  bluetooth.gatt:
+  bluetooth.l2cap:
     platform_allow: native_posix native_posix_64 qemu_x86 qemu_cortex_m3
     tags: bluetooth l2cap
diff --git a/tests/bluetooth/uuid/testcase.yaml b/tests/bluetooth/uuid/testcase.yaml
index 90772f5..1f98abc 100644
--- a/tests/bluetooth/uuid/testcase.yaml
+++ b/tests/bluetooth/uuid/testcase.yaml
@@ -1,4 +1,4 @@
 tests:
-  bluetooth.gatt:
+  bluetooth.uuid:
     platform_allow: native_posix native_posix_64 qemu_x86 qemu_cortex_m3
     tags: bluetooth uuid
diff --git a/tests/drivers/counter/counter_basic_api/testcase.yaml b/tests/drivers/counter/counter_basic_api/testcase.yaml
index b07c04c..083cf3a 100644
--- a/tests/drivers/counter/counter_basic_api/testcase.yaml
+++ b/tests/drivers/counter/counter_basic_api/testcase.yaml
@@ -1,11 +1,11 @@
 tests:
-  drivers.counter:
+  drivers.counter.basic_api:
     tags: drivers
     depends_on: counter
     min_ram: 16
     platform_exclude: nucleo_f302r8
     timeout: 600
-  drivers.counter_nrf_zli:
+  drivers.counter.basic_api.nrf_zli:
     tags: drivers
     depends_on: counter
     platform_allow: nrf52840dk_nrf52840
diff --git a/tests/drivers/counter/counter_nrf_rtc/fixed_top/testcase.yaml b/tests/drivers/counter/counter_nrf_rtc/fixed_top/testcase.yaml
index 8657c43..c509933 100644
--- a/tests/drivers/counter/counter_nrf_rtc/fixed_top/testcase.yaml
+++ b/tests/drivers/counter/counter_nrf_rtc/fixed_top/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  drivers.counter:
+  drivers.counter.nrf_rtc:
     tags: drivers
     depends_on: counter
     platform_allow: nrf52840dk_nrf52840
diff --git a/tests/drivers/dac/dac_api/testcase.yaml b/tests/drivers/dac/dac_api/testcase.yaml
index c35f585..a1bd834 100644
--- a/tests/drivers/dac/dac_api/testcase.yaml
+++ b/tests/drivers/dac/dac_api/testcase.yaml
@@ -1,7 +1,7 @@
 common:
   tags: dac drivers userspace
 tests:
-  drivers.dac:
+  drivers.dac.api:
     platform_allow:
       frdm_k22f frdm_k64f  twr_ke18f
       bl652_dvk bl653_dvk bl654_dvk bl5340_dvk_cpuapp
diff --git a/tests/drivers/dac/dac_loopback/testcase.yaml b/tests/drivers/dac/dac_loopback/testcase.yaml
index 9f5ccab..35c8c0a 100644
--- a/tests/drivers/dac/dac_loopback/testcase.yaml
+++ b/tests/drivers/dac/dac_loopback/testcase.yaml
@@ -1,7 +1,7 @@
 common:
   tags: dac drivers
 tests:
-  drivers.dac:
+  drivers.dac.loopback:
     depends_on: dac adc
     harness: ztest
     harness_config:
diff --git a/tests/drivers/dma/chan_blen_transfer/testcase.yaml b/tests/drivers/dma/chan_blen_transfer/testcase.yaml
index 9bdc538..6ac2432 100644
--- a/tests/drivers/dma/chan_blen_transfer/testcase.yaml
+++ b/tests/drivers/dma/chan_blen_transfer/testcase.yaml
@@ -1,9 +1,9 @@
 tests:
-  drivers.dma:
+  drivers.dma.chan_blen_transfer:
     min_ram: 16
     depends_on: dma
     tags: drivers dma
-  drivers.dma.interactive:
+  drivers.dma.chan_blen_transfer.interactive:
     depends_on: dma
     extra_args: CONF_FILE=prj_shell.conf
     min_ram: 16
diff --git a/tests/drivers/dma/chan_link_transfer/testcase.yaml b/tests/drivers/dma/chan_link_transfer/testcase.yaml
index 6e508cb..c21f668 100644
--- a/tests/drivers/dma/chan_link_transfer/testcase.yaml
+++ b/tests/drivers/dma/chan_link_transfer/testcase.yaml
@@ -1,10 +1,10 @@
 tests:
-  drivers.dma:
+  drivers.dma.chan_link_transfer:
     min_ram: 16
     depends_on: dma
     tags: drivers dma
     platform_allow: frdm_k64f mimxrt1060_evk mimxrt1064_evk mimxrt1160_evk_cm7 mimxrt1170_evk_cm7
-  drivers.dma.interactive:
+  drivers.dma.chan_link_transfer.interactive:
     depends_on: dma
     extra_args: CONF_FILE=prj_shell.conf
     min_ram: 16
diff --git a/tests/drivers/i2c/i2c_api/testcase.yaml b/tests/drivers/i2c/i2c_api/testcase.yaml
index 76d19a7..94e2f2b 100644
--- a/tests/drivers/i2c/i2c_api/testcase.yaml
+++ b/tests/drivers/i2c/i2c_api/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  drivers.i2c:
+  drivers.i2c.api:
     depends_on: i2c
     tags: drivers i2c
     harness: sensor
diff --git a/tests/drivers/i2c/i2c_slave_api/testcase.yaml b/tests/drivers/i2c/i2c_slave_api/testcase.yaml
index 8f45221..f84ff4a 100644
--- a/tests/drivers/i2c/i2c_slave_api/testcase.yaml
+++ b/tests/drivers/i2c/i2c_slave_api/testcase.yaml
@@ -6,7 +6,7 @@
     fixture: i2c_bus_short
 
 tests:
-  drivers.i2c_slave.dual_role:
+  drivers.i2c.slave_api.dual_role:
     platform_allow: nucleo_f091rc stm32f072b_disco nucleo_g071rb rpi_pico
     extra_configs:
       - CONFIG_APP_DUAL_ROLE_I2C=y
diff --git a/tests/drivers/i2c/i2c_tca954x/testcase.yaml b/tests/drivers/i2c/i2c_tca954x/testcase.yaml
index eee2ccd..028d873 100644
--- a/tests/drivers/i2c/i2c_tca954x/testcase.yaml
+++ b/tests/drivers/i2c/i2c_tca954x/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  drivers.i2c:
+  drivers.i2c.tca954x:
     build_only: true
     tags: testing drivers
     depends_on: i2c
diff --git a/tests/drivers/led/led_api/testcase.yaml b/tests/drivers/led/led_api/testcase.yaml
index 4a6e240..75ec70e 100644
--- a/tests/drivers/led/led_api/testcase.yaml
+++ b/tests/drivers/led/led_api/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  drivers.i2c:
+  drivers.led_api.i2c:
     tags: drivers led
     depends_on: led
     filter: dt_alias_exists("led-controller-0")
diff --git a/tests/drivers/sensor/accel/testcase.yaml b/tests/drivers/sensor/accel/testcase.yaml
index d01e083..c1b45f3 100644
--- a/tests/drivers/sensor/accel/testcase.yaml
+++ b/tests/drivers/sensor/accel/testcase.yaml
@@ -1,4 +1,4 @@
 tests:
-  drivers.sensor:
+  drivers.sensor.accel:
     tags: drivers sensor subsys
     platform_allow: native_posix
diff --git a/tests/drivers/sensor/generic/testcase.yaml b/tests/drivers/sensor/generic/testcase.yaml
index bca2f18..8278c5a 100644
--- a/tests/drivers/sensor/generic/testcase.yaml
+++ b/tests/drivers/sensor/generic/testcase.yaml
@@ -3,8 +3,8 @@
     - qemu_x86
     - mps2_an385
 tests:
-  drivers.sensor:
+  drivers.sensor.generic:
     tags: drivers sensor
-  drivers.sensor.fpu:
+  drivers.sensor.generic.fpu:
     extra_args: CONF_FILE=prj_fpu.conf
     tags: drivers sensor
diff --git a/tests/drivers/sensor/sbs_gauge/testcase.yaml b/tests/drivers/sensor/sbs_gauge/testcase.yaml
index 2d0ae35..3a5f0aa 100644
--- a/tests/drivers/sensor/sbs_gauge/testcase.yaml
+++ b/tests/drivers/sensor/sbs_gauge/testcase.yaml
@@ -1,6 +1,6 @@
 tests:
   # section.subsection
-  testing.drivers.sbs_gauge:
+  drivers.sbs_gauge:
     build_only: true
     tags: test_framework
     filter: dt_compat_enabled("sbs,sbs-gauge")
diff --git a/tests/drivers/uart/uart_async_api/testcase.yaml b/tests/drivers/uart/uart_async_api/testcase.yaml
index d91a8c7..bd0a80b 100644
--- a/tests/drivers/uart/uart_async_api/testcase.yaml
+++ b/tests/drivers/uart/uart_async_api/testcase.yaml
@@ -4,13 +4,13 @@
     arduino_nano_33_iot arduino_zero atsamd21_xpro adafruit_feather_m0_basic_proto
 
 tests:
-  drivers.uart.uart_async_api:
+  drivers.uart.async_api:
     tags: drivers
     filter: CONFIG_UART_CONSOLE and CONFIG_SERIAL_SUPPORT_ASYNC
     harness: ztest
     harness_config:
       fixture: gpio_loopback
-  drivers.uart.uart_async_api.nrf_uart:
+  drivers.uart.async_api.nrf_uart:
     tags: drivers
     filter: CONFIG_UART_CONSOLE and CONFIG_SERIAL_SUPPORT_ASYNC
     harness: ztest
@@ -18,7 +18,7 @@
     harness_config:
       fixture: gpio_loopback
     extra_args: DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840.overlay;boards/nrf_uart.overlay"
-  drivers.uart.uart_async_api.rtt:
+  drivers.uart.async_api.rtt:
     tags: drivers
     filter: CONFIG_UART_CONSOLE and CONFIG_SERIAL_SUPPORT_ASYNC and CONFIG_HAS_SEGGER_RTT
     extra_args: DTC_OVERLAY_FILE=boards/segger_rtt.overlay
diff --git a/tests/drivers/uart/uart_basic_api/testcase.yaml b/tests/drivers/uart/uart_basic_api/testcase.yaml
index e9b579c..24ce7b0 100644
--- a/tests/drivers/uart/uart_basic_api/testcase.yaml
+++ b/tests/drivers/uart/uart_basic_api/testcase.yaml
@@ -3,22 +3,22 @@
     - mps2_an385
 
 tests:
-  drivers.uart:
+  drivers.uart.basic_api:
     tags: drivers
     filter: CONFIG_UART_CONSOLE
     harness: keyboard
-  drivers.uart.poll:
+  drivers.uart.basic_api.poll:
     extra_args: CONF_FILE=prj_poll.conf
     tags: drivers
     filter: CONFIG_UART_CONSOLE
     harness: keyboard
-  drivers.uart.shell:
+  drivers.uart.basic_api.shell:
     extra_args: CONF_FILE=prj_shell.conf
     min_flash: 64
     tags: drivers
     filter: CONFIG_UART_CONSOLE
     harness: keyboard
-  drivers.uart.cdc_acm:
+  drivers.uart.basic_api.cdc_acm:
     extra_args: OVERLAY_CONFIG="overlay-usb.conf"
                 DTC_OVERLAY_FILE="usb.overlay"
     tags: drivers usb
diff --git a/tests/drivers/uart/uart_pm/testcase.yaml b/tests/drivers/uart/uart_pm/testcase.yaml
index 9f8a38f..3ab4ee6 100644
--- a/tests/drivers/uart/uart_pm/testcase.yaml
+++ b/tests/drivers/uart/uart_pm/testcase.yaml
@@ -3,7 +3,7 @@
   harness_config:
     fixture: gpio_loopback
 tests:
-  drivers.uart:
+  drivers.uart.pm:
     tags: drivers
     platform_allow: nrf52840dk_nrf52840
     extra_configs:
@@ -11,7 +11,7 @@
       - CONFIG_UART_ASYNC_API=n
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
 
-  drivers.uart_no_rxpin:
+  drivers.uart.pm.no_rxpin:
     tags: drivers
     platform_allow: nrf52840dk_nrf52840
     extra_configs:
@@ -20,7 +20,7 @@
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
     extra_args: DTC_OVERLAY_FILE="boards/nrf52840dk_nrf52840.overlay;nrf_rx_disable.overlay"
 
-  drivers.uart_enhanced_poll:
+  drivers.uart.pm.enhanced_poll:
     tags: drivers
     platform_allow: nrf52840dk_nrf52840
     extra_configs:
@@ -28,7 +28,7 @@
       - CONFIG_UART_ASYNC_API=n
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
 
-  drivers.uart_int_driven:
+  drivers.uart.pm.int_driven:
     tags: drivers
     platform_allow: nrf52840dk_nrf52840
     extra_configs:
@@ -37,7 +37,7 @@
       - CONFIG_UART_ASYNC_API=n
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
 
-  drivers.uart_int_driven_enhanced_poll:
+  drivers.uart.pm.int_driven.enhanced_poll:
     tags: drivers
     platform_allow: nrf52840dk_nrf52840
     extra_configs:
@@ -46,7 +46,7 @@
       - CONFIG_UART_ASYNC_API=n
       - CONFIG_UART_0_ENHANCED_POLL_OUT=y
 
-  drivers.uart_async:
+  drivers.uart.pm.async:
     tags: drivers
     platform_allow: nrf52840dk_nrf52840
     extra_configs:
@@ -58,7 +58,7 @@
       - CONFIG_NRFX_TIMER2=y
       - CONFIG_UART_0_ENHANCED_POLL_OUT=n
 
-  drivers.uart_async_enhanced_poll:
+  drivers.uart.pm.async.enhanced_poll:
     tags: drivers
     platform_allow: nrf52840dk_nrf52840
     extra_configs:
diff --git a/tests/kernel/context/testcase.yaml b/tests/kernel/context/testcase.yaml
index cec3f1a..7eeda47 100644
--- a/tests/kernel/context/testcase.yaml
+++ b/tests/kernel/context/testcase.yaml
@@ -1,7 +1,7 @@
 tests:
-  kernel.common:
+  kernel.context:
     tags: kernel
-  kernel.common.linker_generator:
+  kernel.context.linker_generator:
     platform_allow: qemu_cortex_m3
     tags: kernel linker_generator
     extra_configs:
diff --git a/tests/kernel/mem_slab/mslab/testcase.yaml b/tests/kernel/mem_slab/mslab/testcase.yaml
index aa4bdb4..2ba4e59 100644
--- a/tests/kernel/mem_slab/mslab/testcase.yaml
+++ b/tests/kernel/mem_slab/mslab/testcase.yaml
@@ -1,7 +1,7 @@
 tests:
-  kernel.memory_slabs.api:
+  kernel.memory_slabs:
     tags: kernel
-  kernel.memory_slabs.api.linker_generator:
+  kernel.memory_slabs.linker_generator:
     platform_allow: qemu_cortex_m3
     tags: kernel linker_generator
     extra_configs:
diff --git a/tests/kernel/workq/critical/testcase.yaml b/tests/kernel/workq/critical/testcase.yaml
index de5e9b6..fbd1055 100644
--- a/tests/kernel/workq/critical/testcase.yaml
+++ b/tests/kernel/workq/critical/testcase.yaml
@@ -2,18 +2,18 @@
   tags: kernel
 
 tests:
-  kernel.workqueue:
+  kernel.workqueue.critical:
     platform_exclude: nsim_sem_mpu_stack_guard
     filter: not CONFIG_WDT_SAM
-  kernel.workqueue.sam:
+  kernel.workqueue.critical.sam:
     filter: CONFIG_WDT_SAM
     extra_configs:
      - CONFIG_WDT_DISABLE_AT_BOOT=y
-  kernel.workqueue.nsim:
+  kernel.workqueue.critical.nsim:
     platform_allow: nsim_sem_mpu_stack_guard
     extra_configs:
       - CONFIG_TEST_HW_STACK_PROTECTION=n
-  kernel.workqueue.linker_generator:
+  kernel.workqueue.critical.linker_generator:
     platform_allow: qemu_cortex_m3
     filter: not CONFIG_WDT_SAM
     tags:  linker_generator
diff --git a/tests/lib/devicetree/api/testcase.yaml b/tests/lib/devicetree/api/testcase.yaml
index f9d0083..4c49417 100644
--- a/tests/lib/devicetree/api/testcase.yaml
+++ b/tests/lib/devicetree/api/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  libraries.devicetree:
+  libraries.devicetree.api:
     tags: devicetree
     # We only need this to run on one platform so use native_posix as it
     # will mostly likely be the fastest.
diff --git a/tests/lib/devicetree/api_ext/testcase.yaml b/tests/lib/devicetree/api_ext/testcase.yaml
index 3ac22de..00f070d 100644
--- a/tests/lib/devicetree/api_ext/testcase.yaml
+++ b/tests/lib/devicetree/api_ext/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  libraries.devicetree_ext:
+  libraries.devicetree.api_ext:
     tags: devicetree
     # We only need this to run on one platform so use native_posix as it
     # will mostly likely be the fastest.
diff --git a/tests/lib/devicetree/devices/testcase.yaml b/tests/lib/devicetree/devices/testcase.yaml
index 1dc0324..0f1d394 100644
--- a/tests/lib/devicetree/devices/testcase.yaml
+++ b/tests/lib/devicetree/devices/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  libraries.devicetree:
+  libraries.devicetree.devices:
     tags: devicetree
     # We only need this to run on one platform so use native_posix as it
     # will mostly likely be the fastest.
diff --git a/tests/net/icmpv4/testcase.yaml b/tests/net/icmpv4/testcase.yaml
index 1a78760..e0e57e1 100644
--- a/tests/net/icmpv4/testcase.yaml
+++ b/tests/net/icmpv4/testcase.yaml
@@ -1,6 +1,6 @@
 common:
   depends_on: netif
 tests:
-  net.icmpv6:
+  net.icmpv4:
     min_ram: 16
     tags: net icmpv4
diff --git a/tests/net/socket/af_packet/testcase.yaml b/tests/net/socket/af_packet/testcase.yaml
index ba8a6df..038acd3 100644
--- a/tests/net/socket/af_packet/testcase.yaml
+++ b/tests/net/socket/af_packet/testcase.yaml
@@ -5,5 +5,5 @@
   # needs root permission.
   platform_exclude: native_posix native_posix_64
 tests:
-  net.socket.packet:
+  net.socket.af_packet:
     min_ram: 21
diff --git a/tests/net/socket/af_packet_ipproto_raw/testcase.yaml b/tests/net/socket/af_packet_ipproto_raw/testcase.yaml
index ba8a6df..176176f 100644
--- a/tests/net/socket/af_packet_ipproto_raw/testcase.yaml
+++ b/tests/net/socket/af_packet_ipproto_raw/testcase.yaml
@@ -5,5 +5,5 @@
   # needs root permission.
   platform_exclude: native_posix native_posix_64
 tests:
-  net.socket.packet:
+  net.socket.af_packet.ipproto_raw:
     min_ram: 21
diff --git a/tests/net/socket/tls_ext/testcase.yaml b/tests/net/socket/tls_ext/testcase.yaml
index a25d180..a8baa3a 100644
--- a/tests/net/socket/tls_ext/testcase.yaml
+++ b/tests/net/socket/tls_ext/testcase.yaml
@@ -1,6 +1,6 @@
 common:
   tags: net socket tls
 tests:
-  net.socket.tls:
+  net.socket.tls.ext:
     min_ram: 65536
     platform_allow: qemu_cortex_m3 qemu_x86
diff --git a/tests/subsys/shell/shell_flash/testcase.yaml b/tests/subsys/shell/shell_flash/testcase.yaml
index fd747b5..ad7519c 100644
--- a/tests/subsys/shell/shell_flash/testcase.yaml
+++ b/tests/subsys/shell/shell_flash/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  shell.history:
+  shell.flash:
     min_flash: 64
     min_ram: 32
     filter: ( CONFIG_FLASH_SHELL )
diff --git a/tests/ztest/base/testcase.yaml b/tests/ztest/base/testcase.yaml
index 893b609..41c04a3 100644
--- a/tests/ztest/base/testcase.yaml
+++ b/tests/ztest/base/testcase.yaml
@@ -1,18 +1,18 @@
 tests:
-  testing.ztest:
+  testing.ztest.base:
     tags: test_framework
     type: unit
-  testing.ztest.verbose_0:
+  testing.ztest.base.verbose_0:
     extra_args: CONF_FILE=prj_verbose_0.conf
     tags: test_framework
     integration_platforms:
       - native_posix
-  testing.ztest.verbose_1:
+  testing.ztest.base.verbose_1:
     extra_args: CONF_FILE=prj_verbose_1.conf
     tags: test_framework
     integration_platforms:
       - native_posix
-  testing.ztest.verbose_2:
+  testing.ztest.base.verbose_2:
     extra_args: CONF_FILE=prj_verbose_2.conf
     tags: test_framework
     integration_platforms: