diff --git a/.github/test-spec.yml b/.github/test-spec.yml
index 40fc3e018790..d871a730afa9 100644
--- a/.github/test-spec.yml
+++ b/.github/test-spec.yml
@@ -137,7 +137,7 @@
   - "samples/cellular/fmfu_smp_svr/**/*"
   - "samples/cellular/http_update/**/*"
   - "samples/nrf5340/netboot/*"
-  - "samples/bootloader/**/*"
+  - "samples/nsib/**/*"
   - "scripts/bootloader/**/*"
   - "subsys/bootloader/**/*"
   - "subsys/nonsecure/*"
@@ -161,7 +161,7 @@
   - "modules/trusted-firmware-m/*"
   - "samples/nrf5340/netboot/**/*"
   - "samples/nrf5340/extxip_smp_svr/**/*"
-  - "samples/bootloader/**/*"
+  - "samples/nsib/**/*"
   - "scripts/bootloader/**/*"
   - "subsys/bootloader/**/*"
   - "subsys/nonsecure/*"
diff --git a/CODEOWNERS b/CODEOWNERS
index 47d7f19e41e2..a05eb9ac91c5 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -422,7 +422,7 @@
 /samples/app_event_manager_profiler_tracer/ @nrfconnect/ncs-si-muffin @nrfconnect/ncs-si-bluebagel
 /samples/benchmarks/coremark/             @nrfconnect/ncs-si-bluebagel
 /samples/bluetooth/nrf_auraconfig/        @nrfconnect/ncs-audio
-/samples/bluetooth/central_and_peripheral_hr/ @nrfconnect/ncs-si-muffin
+/samples/bluetooth/central_and_peripheral_hrs/ @nrfconnect/ncs-si-muffin
 /samples/bluetooth/central_bas/           @nrfconnect/ncs-si-muffin
 /samples/bluetooth/central_hids/          @nrfconnect/ncs-si-bluebagel
 /samples/bluetooth/central_hr_coded/      @nrfconnect/ncs-si-muffin
@@ -471,7 +471,7 @@
 /samples/bluetooth/shell_bt_nus/          @nrfconnect/ncs-si-muffin
 /samples/bluetooth/subrating/             @nrfconnect/ncs-dragoon
 /samples/bluetooth/throughput/            @nrfconnect/ncs-si-muffin
-/samples/bootloader/                      @nrfconnect/ncs-pluto
+/samples/nsib/                            @nrfconnect/ncs-pluto
 /samples/caf/                             @nrfconnect/ncs-si-muffin @nrfconnect/ncs-si-bluebagel
 /samples/caf_sensor_manager/              @nrfconnect/ncs-si-muffin @nrfconnect/ncs-si-bluebagel
 /samples/cellular/                        @nrfconnect/ncs-co-networking @nrfconnect/ncs-modem
@@ -482,7 +482,7 @@
 /samples/cellular/modem_shell/            @trantanen @jhirsi @tokangas
 /samples/cellular/nidd/                   @stig-bjorlykke
 /samples/cellular/nrf_cloud_*             @nrfconnect/ncs-nrf-cloud
-/samples/cellular/nrf_provisioning/       @nrfconnect/ncs-iot-oulu
+/samples/cellular/nrf_device_provisioning/ @nrfconnect/ncs-iot-oulu
 /samples/cellular/modem_trace_flash/      @nrfconnect/ncs-modem
 /samples/cellular/slm_shell/              @nrfconnect/ncs-iot-oulu
 /samples/cellular/sms/                    @trantanen @tokangas
@@ -546,7 +546,7 @@
 /samples/app_event_manager_profiler_tracer/*.rst @nrfconnect/ncs-si-muffin-doc
 /samples/benchmarks/coremark/*.rst        @nrfconnect/ncs-si-bluebagel-doc
 /samples/bluetooth/**/*.rst                @nrfconnect/ncs-si-bluebagel-doc @nrfconnect/ncs-si-muffin-doc
-/samples/bluetooth/central_and_peripheral_hr/*.rst @nrfconnect/ncs-si-muffin-doc
+/samples/bluetooth/central_and_peripheral_hrs/*.rst @nrfconnect/ncs-si-muffin-doc
 /samples/bluetooth/central_bas/*.rst      @nrfconnect/ncs-si-muffin-doc
 /samples/bluetooth/nrf_auraconfig/*.rst   @nrfconnect/ncs-audio-doc
 /samples/bluetooth/*_hids*/*.rst          @nrfconnect/ncs-si-bluebagel-doc
@@ -596,7 +596,7 @@
 /samples/bluetooth/shell_bt_nus/*.rst     @nrfconnect/ncs-si-muffin-doc
 /samples/bluetooth/subrating/*.rst        @nrfconnect/ncs-dragoon-doc
 /samples/bluetooth/throughput/*.rst       @nrfconnect/ncs-si-muffin-doc
-/samples/bootloader/*.rst                 @nrfconnect/ncs-pluto-doc
+/samples/nsib/*.rst                 @nrfconnect/ncs-pluto-doc
 /samples/caf/*.rst                        @nrfconnect/ncs-si-muffin-doc @nrfconnect/ncs-si-bluebagel-doc
 /samples/caf_sensor_manager/*.rst         @nrfconnect/ncs-si-muffin-doc @nrfconnect/ncs-si-bluebagel-doc
 /samples/cellular/**/*.rst                @nrfconnect/ncs-modem-doc
@@ -606,7 +606,7 @@
 /samples/cellular/lwm2m_client/*.rst      @nrfconnect/ncs-iot-oulu-tampere-doc
 /samples/cellular/modem_shell/*.rst       @nrfconnect/ncs-iot-positioning-doc
 /samples/cellular/nrf_cloud_*/**/*.rst    @nrfconnect/ncs-nrf-cloud-doc
-/samples/cellular/nrf_provisioning/*.rst  @nrfconnect/ncs-iot-oulu-tampere-doc
+/samples/cellular/nrf_device_provisioning/*.rst @nrfconnect/ncs-iot-oulu-tampere-doc
 /samples/cellular/slm_shell/*.rst         @nrfconnect/ncs-iot-oulu-tampere-doc
 /samples/cellular/sms/*.rst               @nrfconnect/ncs-iot-positioning-doc
 /samples/crypto/**/*.rst                  @nrfconnect/ncs-aegir-doc
diff --git a/applications/serial_lte_modem/sysbuild/b0/prj.conf b/applications/serial_lte_modem/sysbuild/b0/prj.conf
index 056b65bb4f4f..2a9fed637f79 100644
--- a/applications/serial_lte_modem/sysbuild/b0/prj.conf
+++ b/applications/serial_lte_modem/sysbuild/b0/prj.conf
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-# b0 defaults from /samples/bootloader/prj.conf
+# b0 defaults from /samples/nsib/prj.conf
 CONFIG_IS_SECURE_BOOTLOADER=y
 CONFIG_MULTITHREADING=n
 CONFIG_GPIO=n
diff --git a/doc/_utils/redirects.py b/doc/_utils/redirects.py
index 4009282c2c78..a7b2f239ece8 100644
--- a/doc/_utils/redirects.py
+++ b/doc/_utils/redirects.py
@@ -399,6 +399,12 @@
     ("samples/samples_bl", "samples/bl"), # Bluetooth samples (landing)
     ("samples/bluetooth/connection_event_trigger/README", "samples/bluetooth/event_trigger/README"),
     ("samples/bluetooth/broadcast_config_tool/README", "samples/bluetooth/nrf_auraconfig/README"),
+    ("samples/bluetooth/central_and_peripheral_hr/README", "samples/bluetooth/central_and_peripheral_hrs/README"), # Renamed the folders to better match the sample names
+    ("samples/bootloader/README", "samples/nsib/README"),
+    ("samples/cellular/nrf_provisioning/README", "samples/cellular/nrf_device_provisioning/README"),
+    ("samples/bluetooth/mesh/light_ctrl/README", "samples/bluetooth/mesh/light_fixture/README"),
+    ("samples/bluetooth/mesh/sensor_client/README", "samples/bluetooth/mesh/sensor_observer/README"),
+    ("samples/cellular/lte_ble_gateway/README", "samples/cellular/lte_sensor_gateway/README"),
     ("samples/samples_nrf9160", "samples/cellular"), # Cellular samples (landing)
     ("samples/samples_crypto", "samples/crypto"), # Cryptography samples (landing)
     ("samples/samples_edge", "samples/edge"), # Edge Impulse samples (landing)
diff --git a/doc/_zoomin/ncs.tags.yml b/doc/_zoomin/ncs.tags.yml
index 7925d67374b0..fe18b93c0705 100644
--- a/doc/_zoomin/ncs.tags.yml
+++ b/doc/_zoomin/ncs.tags.yml
@@ -378,7 +378,7 @@ mapping_topics:
   - nrf/libraries/networking/nrf_cloud_log.html: ["nrf-cloud"]
   - nrf/libraries/networking/nrf_cloud_pgps.html: ["nrf-cloud"]
   - nrf/libraries/networking/nrf_cloud_rest.html: ["nrf-cloud"]
-  - nrf/libraries/networking/nrf_provisioning.html: ["at-commands"]
+  - nrf/libraries/networking/nrf_device_provisioning.html: ["at-commands"]
   - nrf/libraries/networking/softap_wifi_provision: ["wifi", "nrf70-series", "nrf7002", "nrf7001",
                                                      "nrf7000"]
   - nrf/libraries/networking/lwm2m_client_utils.html: ["lte"]
diff --git a/doc/nrf/app_dev/bootloaders_dfu/mcuboot_nsib/bootloader_config.rst b/doc/nrf/app_dev/bootloaders_dfu/mcuboot_nsib/bootloader_config.rst
index 6abd407b0fb0..b1ce57e36470 100644
--- a/doc/nrf/app_dev/bootloaders_dfu/mcuboot_nsib/bootloader_config.rst
+++ b/doc/nrf/app_dev/bootloaders_dfu/mcuboot_nsib/bootloader_config.rst
@@ -9,7 +9,7 @@ Customizing the bootloader
 
 By default, to set Kconfig options, the |NSIB| and MCUboot bootloaders use Kconfig project configuration files, usually called :file:`prj.conf`, located in their source directories:
 
-* |NSIB| - :file:`nrf/samples/bootloader`
+* |NSIB| - :file:`nrf/samples/nsib`
 * MCUboot - :file:`bootloader/mcuboot/boot/zephyr`
 
 However, there are other ways to customize your application using Kconfig options:
diff --git a/doc/nrf/app_dev/companion_components.rst b/doc/nrf/app_dev/companion_components.rst
index 09de6703cb5f..fc4e91c3a63d 100644
--- a/doc/nrf/app_dev/companion_components.rst
+++ b/doc/nrf/app_dev/companion_components.rst
@@ -47,7 +47,7 @@ The following table lists the available companion components:
    * - :ref:`bootloader`
      - Bootloader tailored for the :ref:`two-stage bootloader <immutable_bootloader>`.
      - :ref:`Bootloader requirements <bootloader_rot>`
-     - :file:`samples/bootloader`
+     - :file:`samples/nsib`
      - :ref:`ug_bootloader_adding_immutable_b0`
    * - :ref:`SUIT flash companion <suit_flash_companion>`
      - Companion image that allows the Secure Domain Firmware to access the external memory during the :ref:`Software Updates for Internet of Things (SUIT) <ug_nrf54h20_suit_dfu>` firmware upgrade.
diff --git a/doc/nrf/app_dev/config_and_build/multi_image.rst b/doc/nrf/app_dev/config_and_build/multi_image.rst
index 5292c17eb22d..43c243cda829 100644
--- a/doc/nrf/app_dev/config_and_build/multi_image.rst
+++ b/doc/nrf/app_dev/config_and_build/multi_image.rst
@@ -284,7 +284,7 @@ See :ref:`ug_bootloader` for more details.
 .. note::
 
    The build system grabs the Kconfig fragment or configuration file specified in a CMake argument relative to that image's application directory.
-   For example, the build system uses ``nrf/samples/bootloader/my-fragment.conf`` when building with the ``-Db0_EXTRA_CONF_FILE=my-fragment.conf`` option, whereas ``-DEXTRA_CONF_FILE=my-fragment.conf`` grabs the fragment from the main application's directory, such as ``zephyr/samples/hello_world/my-fragment.conf``.
+   For example, the build system uses file:`nrf/samples/nsib/my-fragment.conf` when building with the ``-Db0_EXTRA_CONF_FILE=my-fragment.conf`` option, whereas ``-DEXTRA_CONF_FILE=my-fragment.conf`` grabs the fragment from the main application's directory, such as ``zephyr/samples/hello_world/my-fragment.conf``.
 
 You can also merge multiple fragments into the overall configuration for an image by giving a list of Kconfig fragments as a string, separated using ``;``.
 The following example shows how to combine ``abc.conf``, Kconfig fragment of the ``childimageone`` child image, with the ``extrafragment.conf`` fragment:
@@ -327,7 +327,7 @@ The build system does also automatically apply any devicetree overlay located in
 .. note::
 
    The build system grabs the devicetree overlay files specified in a CMake argument relative to that image's application directory.
-   For example, the build system uses ``nrf/samples/bootloader/my-dts.overlay`` when building with the ``-Db0_DTC_OVERLAY_FILE=my-dts.overlay`` option, whereas ``-DDTC_OVERLAY_FILE=my-dts.overlay`` grabs the fragment from the main application's directory, such as ``zephyr/samples/hello_world/my-dts.overlay``.
+   For example, the build system uses ``nrf/samples/nsib/my-dts.overlay`` when building with the ``-Db0_DTC_OVERLAY_FILE=my-dts.overlay`` option, whereas ``-DDTC_OVERLAY_FILE=my-dts.overlay`` grabs the fragment from the main application's directory, such as ``zephyr/samples/hello_world/my-dts.overlay``.
 
 .. _ug_multi_image_permanent_changes:
 
diff --git a/samples/bluetooth/central_and_peripheral_hr/CMakeLists.txt b/samples/bluetooth/central_and_peripheral_hrs/CMakeLists.txt
similarity index 88%
rename from samples/bluetooth/central_and_peripheral_hr/CMakeLists.txt
rename to samples/bluetooth/central_and_peripheral_hrs/CMakeLists.txt
index 34d3c9d72763..a02122e6a6e4 100644
--- a/samples/bluetooth/central_and_peripheral_hr/CMakeLists.txt
+++ b/samples/bluetooth/central_and_peripheral_hrs/CMakeLists.txt
@@ -5,7 +5,7 @@
 #
 cmake_minimum_required(VERSION 3.20.0)
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(central_and_peripheral_hr)
+project(central_and_peripheral_hrs)
 
 # NORDIC SDK APP START
 target_sources(app PRIVATE
diff --git a/samples/bluetooth/central_and_peripheral_hr/Kconfig b/samples/bluetooth/central_and_peripheral_hrs/Kconfig
similarity index 100%
rename from samples/bluetooth/central_and_peripheral_hr/Kconfig
rename to samples/bluetooth/central_and_peripheral_hrs/Kconfig
diff --git a/samples/bluetooth/central_and_peripheral_hr/Kconfig.sysbuild b/samples/bluetooth/central_and_peripheral_hrs/Kconfig.sysbuild
similarity index 100%
rename from samples/bluetooth/central_and_peripheral_hr/Kconfig.sysbuild
rename to samples/bluetooth/central_and_peripheral_hrs/Kconfig.sysbuild
diff --git a/samples/bluetooth/central_and_peripheral_hr/README.rst b/samples/bluetooth/central_and_peripheral_hrs/README.rst
similarity index 96%
rename from samples/bluetooth/central_and_peripheral_hr/README.rst
rename to samples/bluetooth/central_and_peripheral_hrs/README.rst
index c6efd3c32ce2..6dabb4fdcc4e 100644
--- a/samples/bluetooth/central_and_peripheral_hr/README.rst
+++ b/samples/bluetooth/central_and_peripheral_hrs/README.rst
@@ -80,7 +80,7 @@ User interface
 
 Building and running
 ********************
-.. |sample path| replace:: :file:`samples/bluetooth/central_and_peripheral_hr`
+.. |sample path| replace:: :file:`samples/bluetooth/central_and_peripheral_hrs`
 
 .. include:: /includes/build_and_run_ns.txt
 
@@ -174,7 +174,7 @@ Testing with Bluetooth Low Energy app
       #. Open the `Bluetooth Low Energy app`_ and select the connected dongle that is used for communication.
       #. Open the **SERVER SETUP** tab.
       #. Click the dongle configuration and select :guilabel:`Load setup`.
-      #. Load the :file:`hr_service.ncs` file that is located under :file:`samples/bluetooth/central_and_peripheral_hr` in the |NCS| folder structure.
+      #. Load the :file:`hr_service.ncs` file that is located under :file:`samples/bluetooth/central_and_peripheral_hrs` in the |NCS| folder structure.
       #. Click :guilabel:`Apply to device`.
       #. Open the **CONNECTION MAP** tab.
       #. Click the dongle configuration (gear icon) and select :guilabel:`Advertising setup`.
@@ -182,7 +182,7 @@ Testing with Bluetooth Low Energy app
          The current version of nRF Connect can store the advertising setup.
 
       #. Click :guilabel:`Load setup`.
-         Load the :file:`hrs_adv_setup.ncs` file that is located under :file:`samples/bluetooth/central_and_peripheral_hr` in the |NCS| folder structure.
+         Load the :file:`hrs_adv_setup.ncs` file that is located under :file:`samples/bluetooth/central_and_peripheral_hrs` in the |NCS| folder structure.
       #. Click :guilabel:`Apply` and :guilabel:`Close`.
       #. Click the gear icon to open the Adapter settings and select :guilabel:`Start advertising`.
       #. Wait until the development kit running the Central and Peripheral HRS connects.
@@ -220,7 +220,7 @@ Testing with Bluetooth Low Energy app
       #. Open the `Bluetooth Low Energy app`_ and select the connected dongle that is used for communication.
       #. Open the **SERVER SETUP** tab.
       #. Click the dongle configuration and select :guilabel:`Load setup`.
-      #. Load the :file:`hr_service.ncs` file that is located under :file:`samples/bluetooth/central_and_peripheral_hr` in the |NCS| folder structure.
+      #. Load the :file:`hr_service.ncs` file that is located under :file:`samples/bluetooth/central_and_peripheral_hrs` in the |NCS| folder structure.
       #. Click :guilabel:`Apply to device`.
       #. Open the **CONNECTION MAP** tab.
       #. Click the dongle configuration (gear icon) and select :guilabel:`Advertising setup`.
@@ -228,7 +228,7 @@ Testing with Bluetooth Low Energy app
          The current version of nRF Connect can store the advertising setup.
 
       #. Click :guilabel:`Load setup`.
-         Load the :file:`hrs_adv_setup.ncs` file that is located under :file:`samples/bluetooth/central_and_peripheral_hr` in the |NCS| folder structure.
+         Load the :file:`hrs_adv_setup.ncs` file that is located under :file:`samples/bluetooth/central_and_peripheral_hrs` in the |NCS| folder structure.
       #. Click :guilabel:`Apply` and :guilabel:`Close`.
       #. Click the gear icon to open the Adapter settings and select :guilabel:`Start advertising`.
       #. Wait until the development kit running the Central and Peripheral HRS connects.
diff --git a/samples/bluetooth/central_and_peripheral_hr/hr_service.ncs b/samples/bluetooth/central_and_peripheral_hrs/hr_service.ncs
similarity index 100%
rename from samples/bluetooth/central_and_peripheral_hr/hr_service.ncs
rename to samples/bluetooth/central_and_peripheral_hrs/hr_service.ncs
diff --git a/samples/bluetooth/central_and_peripheral_hr/hrs_adv_setup.ncs b/samples/bluetooth/central_and_peripheral_hrs/hrs_adv_setup.ncs
similarity index 100%
rename from samples/bluetooth/central_and_peripheral_hr/hrs_adv_setup.ncs
rename to samples/bluetooth/central_and_peripheral_hrs/hrs_adv_setup.ncs
diff --git a/samples/bluetooth/central_and_peripheral_hr/prj.conf b/samples/bluetooth/central_and_peripheral_hrs/prj.conf
similarity index 100%
rename from samples/bluetooth/central_and_peripheral_hr/prj.conf
rename to samples/bluetooth/central_and_peripheral_hrs/prj.conf
diff --git a/samples/bluetooth/central_and_peripheral_hr/sample.yaml b/samples/bluetooth/central_and_peripheral_hrs/sample.yaml
similarity index 92%
rename from samples/bluetooth/central_and_peripheral_hr/sample.yaml
rename to samples/bluetooth/central_and_peripheral_hrs/sample.yaml
index 5596d8d8e428..24f33d11b352 100644
--- a/samples/bluetooth/central_and_peripheral_hr/sample.yaml
+++ b/samples/bluetooth/central_and_peripheral_hrs/sample.yaml
@@ -2,7 +2,7 @@ sample:
   description: Bluetooth Low Energy central and peripheral heart rate relay sample
   name: Bluetooth LE Central and Peripheral HRS
 tests:
-  sample.bluetooth.central_and_peripheral_hr.build:
+  sample.bluetooth.central_and_peripheral_hrs.build:
     sysbuild: true
     build_only: true
     integration_platforms:
diff --git a/samples/bluetooth/central_and_peripheral_hr/src/main.c b/samples/bluetooth/central_and_peripheral_hrs/src/main.c
similarity index 100%
rename from samples/bluetooth/central_and_peripheral_hr/src/main.c
rename to samples/bluetooth/central_and_peripheral_hrs/src/main.c
diff --git a/samples/bluetooth/central_and_peripheral_hr/sysbuild/ipc_radio.conf b/samples/bluetooth/central_and_peripheral_hrs/sysbuild/ipc_radio.conf
similarity index 100%
rename from samples/bluetooth/central_and_peripheral_hr/sysbuild/ipc_radio.conf
rename to samples/bluetooth/central_and_peripheral_hrs/sysbuild/ipc_radio.conf
diff --git a/samples/bluetooth/mesh/light_ctrl/CMakeLists.txt b/samples/bluetooth/mesh/light_fixture/CMakeLists.txt
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/CMakeLists.txt
rename to samples/bluetooth/mesh/light_fixture/CMakeLists.txt
diff --git a/samples/bluetooth/mesh/light_ctrl/Kconfig.sysbuild b/samples/bluetooth/mesh/light_fixture/Kconfig.sysbuild
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/Kconfig.sysbuild
rename to samples/bluetooth/mesh/light_fixture/Kconfig.sysbuild
diff --git a/samples/bluetooth/mesh/light_ctrl/README.rst b/samples/bluetooth/mesh/light_fixture/README.rst
similarity index 99%
rename from samples/bluetooth/mesh/light_ctrl/README.rst
rename to samples/bluetooth/mesh/light_fixture/README.rst
index 503d970788df..a666af7675b6 100644
--- a/samples/bluetooth/mesh/light_ctrl/README.rst
+++ b/samples/bluetooth/mesh/light_fixture/README.rst
@@ -200,7 +200,7 @@ For more information about configuration files in the |NCS|, see :ref:`app_build
 Building and running
 ********************
 
-.. |sample path| replace:: :file:`samples/bluetooth/mesh/light_ctrl`
+.. |sample path| replace:: :file:`samples/bluetooth/mesh/light_fixture`
 
 .. include:: /includes/build_and_run_ns.txt
 
diff --git a/samples/bluetooth/mesh/light_ctrl/VERSION b/samples/bluetooth/mesh/light_fixture/VERSION
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/VERSION
rename to samples/bluetooth/mesh/light_fixture/VERSION
diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf52dk_nrf52832.conf b/samples/bluetooth/mesh/light_fixture/boards/nrf52dk_nrf52832.conf
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/boards/nrf52dk_nrf52832.conf
rename to samples/bluetooth/mesh/light_fixture/boards/nrf52dk_nrf52832.conf
diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf5340dk_nrf5340_cpuapp.overlay b/samples/bluetooth/mesh/light_fixture/boards/nrf5340dk_nrf5340_cpuapp.overlay
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/boards/nrf5340dk_nrf5340_cpuapp.overlay
rename to samples/bluetooth/mesh/light_fixture/boards/nrf5340dk_nrf5340_cpuapp.overlay
diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf5340dk_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh/light_fixture/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
rename to samples/bluetooth/mesh/light_fixture/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay b/samples/bluetooth/mesh/light_fixture/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay
rename to samples/bluetooth/mesh/light_fixture/boards/nrf5340dk_nrf5340_cpuapp_ns.overlay
diff --git a/samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/light_fixture/boards/nrf54l15dk_nrf54l15_cpuapp.conf
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/boards/nrf54l15dk_nrf54l15_cpuapp.conf
rename to samples/bluetooth/mesh/light_fixture/boards/nrf54l15dk_nrf54l15_cpuapp.conf
diff --git a/samples/bluetooth/mesh/light_ctrl/boards/thingy53_nrf5340_cpuapp.conf b/samples/bluetooth/mesh/light_fixture/boards/thingy53_nrf5340_cpuapp.conf
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/boards/thingy53_nrf5340_cpuapp.conf
rename to samples/bluetooth/mesh/light_fixture/boards/thingy53_nrf5340_cpuapp.conf
diff --git a/samples/bluetooth/mesh/light_ctrl/images/bt_mesh_light_ctrl_levels.svg b/samples/bluetooth/mesh/light_fixture/images/bt_mesh_light_ctrl_levels.svg
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/images/bt_mesh_light_ctrl_levels.svg
rename to samples/bluetooth/mesh/light_fixture/images/bt_mesh_light_ctrl_levels.svg
diff --git a/samples/bluetooth/mesh/light_ctrl/include/lc_pwm_led.h b/samples/bluetooth/mesh/light_fixture/include/lc_pwm_led.h
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/include/lc_pwm_led.h
rename to samples/bluetooth/mesh/light_fixture/include/lc_pwm_led.h
diff --git a/samples/bluetooth/mesh/light_ctrl/include/model_handler.h b/samples/bluetooth/mesh/light_fixture/include/model_handler.h
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/include/model_handler.h
rename to samples/bluetooth/mesh/light_fixture/include/model_handler.h
diff --git a/samples/bluetooth/mesh/light_ctrl/overlay-emds.conf b/samples/bluetooth/mesh/light_fixture/overlay-emds.conf
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/overlay-emds.conf
rename to samples/bluetooth/mesh/light_fixture/overlay-emds.conf
diff --git a/samples/bluetooth/mesh/light_ctrl/pm_static_nrf52840dongle_nrf52840.yml b/samples/bluetooth/mesh/light_fixture/pm_static_nrf52840dongle_nrf52840.yml
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/pm_static_nrf52840dongle_nrf52840.yml
rename to samples/bluetooth/mesh/light_fixture/pm_static_nrf52840dongle_nrf52840.yml
diff --git a/samples/bluetooth/mesh/light_ctrl/prj.conf b/samples/bluetooth/mesh/light_fixture/prj.conf
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/prj.conf
rename to samples/bluetooth/mesh/light_fixture/prj.conf
diff --git a/samples/bluetooth/mesh/light_ctrl/sample.yaml b/samples/bluetooth/mesh/light_fixture/sample.yaml
similarity index 95%
rename from samples/bluetooth/mesh/light_ctrl/sample.yaml
rename to samples/bluetooth/mesh/light_fixture/sample.yaml
index ef800ccb1a05..1ec10644552c 100644
--- a/samples/bluetooth/mesh/light_ctrl/sample.yaml
+++ b/samples/bluetooth/mesh/light_fixture/sample.yaml
@@ -2,7 +2,7 @@ sample:
   description: Bluetooth Mesh light fixture sample
   name: Bluetooth Mesh light fixture
 tests:
-  sample.bluetooth.mesh.light_ctrl:
+  sample.bluetooth.mesh.light_fixture:
     sysbuild: true
     build_only: true
     integration_platforms:
@@ -33,7 +33,7 @@ tests:
       - bluetooth
       - ci_build
       - sysbuild
-  sample.bluetooth.mesh.light_ctrl.emds:
+  sample.bluetooth.mesh.light_fixture.emds:
     sysbuild: true
     extra_args: OVERLAY_CONFIG="overlay-emds.conf"
     build_only: true
diff --git a/samples/bluetooth/mesh/light_ctrl/src/lc_pwm_led.c b/samples/bluetooth/mesh/light_fixture/src/lc_pwm_led.c
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/src/lc_pwm_led.c
rename to samples/bluetooth/mesh/light_fixture/src/lc_pwm_led.c
diff --git a/samples/bluetooth/mesh/light_ctrl/src/main.c b/samples/bluetooth/mesh/light_fixture/src/main.c
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/src/main.c
rename to samples/bluetooth/mesh/light_fixture/src/main.c
diff --git a/samples/bluetooth/mesh/light_ctrl/src/model_handler.c b/samples/bluetooth/mesh/light_fixture/src/model_handler.c
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/src/model_handler.c
rename to samples/bluetooth/mesh/light_fixture/src/model_handler.c
diff --git a/samples/bluetooth/mesh/light_ctrl/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/mesh/light_fixture/sysbuild/ipc_radio/prj.conf
similarity index 100%
rename from samples/bluetooth/mesh/light_ctrl/sysbuild/ipc_radio/prj.conf
rename to samples/bluetooth/mesh/light_fixture/sysbuild/ipc_radio/prj.conf
diff --git a/samples/bluetooth/mesh/sensor_client/CMakeLists.txt b/samples/bluetooth/mesh/sensor_observer/CMakeLists.txt
similarity index 100%
rename from samples/bluetooth/mesh/sensor_client/CMakeLists.txt
rename to samples/bluetooth/mesh/sensor_observer/CMakeLists.txt
diff --git a/samples/bluetooth/mesh/sensor_client/Kconfig.sysbuild b/samples/bluetooth/mesh/sensor_observer/Kconfig.sysbuild
similarity index 100%
rename from samples/bluetooth/mesh/sensor_client/Kconfig.sysbuild
rename to samples/bluetooth/mesh/sensor_observer/Kconfig.sysbuild
diff --git a/samples/bluetooth/mesh/sensor_client/README.rst b/samples/bluetooth/mesh/sensor_observer/README.rst
similarity index 99%
rename from samples/bluetooth/mesh/sensor_client/README.rst
rename to samples/bluetooth/mesh/sensor_observer/README.rst
index ffd686a89b25..cee2998d3bf3 100644
--- a/samples/bluetooth/mesh/sensor_client/README.rst
+++ b/samples/bluetooth/mesh/sensor_observer/README.rst
@@ -1,4 +1,5 @@
 .. _bluetooth_mesh_sensor_client:
+.. _bluetooth_mesh_sensor_observer:
 
 Bluetooth Mesh: Sensor observer
 ###############################
@@ -153,11 +154,11 @@ FEM support
 Building and running
 ********************
 
-.. |sample path| replace:: :file:`samples/bluetooth/mesh/sensor_client`
+.. |sample path| replace:: :file:`samples/bluetooth/mesh/sensor_observer`
 
 .. include:: /includes/build_and_run.txt
 
-.. _bluetooth_mesh_sensor_client_testing:
+.. _bluetooth_mesh_sensor_observer_testing:
 
 Testing
 =======
diff --git a/samples/bluetooth/mesh/sensor_client/VERSION b/samples/bluetooth/mesh/sensor_observer/VERSION
similarity index 100%
rename from samples/bluetooth/mesh/sensor_client/VERSION
rename to samples/bluetooth/mesh/sensor_observer/VERSION
diff --git a/samples/bluetooth/mesh/sensor_client/boards/nrf52dk_nrf52832.conf b/samples/bluetooth/mesh/sensor_observer/boards/nrf52dk_nrf52832.conf
similarity index 100%
rename from samples/bluetooth/mesh/sensor_client/boards/nrf52dk_nrf52832.conf
rename to samples/bluetooth/mesh/sensor_observer/boards/nrf52dk_nrf52832.conf
diff --git a/samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/mesh/sensor_observer/boards/nrf54l15dk_nrf54l15_cpuapp.conf
similarity index 100%
rename from samples/bluetooth/mesh/sensor_client/boards/nrf54l15dk_nrf54l15_cpuapp.conf
rename to samples/bluetooth/mesh/sensor_observer/boards/nrf54l15dk_nrf54l15_cpuapp.conf
diff --git a/samples/bluetooth/mesh/sensor_client/include/model_handler.h b/samples/bluetooth/mesh/sensor_observer/include/model_handler.h
similarity index 100%
rename from samples/bluetooth/mesh/sensor_client/include/model_handler.h
rename to samples/bluetooth/mesh/sensor_observer/include/model_handler.h
diff --git a/samples/bluetooth/mesh/sensor_client/prj.conf b/samples/bluetooth/mesh/sensor_observer/prj.conf
similarity index 100%
rename from samples/bluetooth/mesh/sensor_client/prj.conf
rename to samples/bluetooth/mesh/sensor_observer/prj.conf
diff --git a/samples/bluetooth/mesh/sensor_client/sample.yaml b/samples/bluetooth/mesh/sensor_observer/sample.yaml
similarity index 93%
rename from samples/bluetooth/mesh/sensor_client/sample.yaml
rename to samples/bluetooth/mesh/sensor_observer/sample.yaml
index 7f8caeadfb3f..b7374e2dbfe1 100644
--- a/samples/bluetooth/mesh/sensor_client/sample.yaml
+++ b/samples/bluetooth/mesh/sensor_observer/sample.yaml
@@ -2,7 +2,7 @@ sample:
   description: Bluetooth Mesh sensor observer sample
   name: Bluetooth Mesh sensor observer
 tests:
-  sample.bluetooth.mesh.sensor_client:
+  sample.bluetooth.mesh.sensor_observer:
     sysbuild: true
     build_only: true
     integration_platforms:
diff --git a/samples/bluetooth/mesh/sensor_client/src/main.c b/samples/bluetooth/mesh/sensor_observer/src/main.c
similarity index 100%
rename from samples/bluetooth/mesh/sensor_client/src/main.c
rename to samples/bluetooth/mesh/sensor_observer/src/main.c
diff --git a/samples/bluetooth/mesh/sensor_client/src/model_handler.c b/samples/bluetooth/mesh/sensor_observer/src/model_handler.c
similarity index 100%
rename from samples/bluetooth/mesh/sensor_client/src/model_handler.c
rename to samples/bluetooth/mesh/sensor_observer/src/model_handler.c
diff --git a/samples/cellular/lte_ble_gateway/CMakeLists.txt b/samples/cellular/lte_sensor_gateway/CMakeLists.txt
similarity index 100%
rename from samples/cellular/lte_ble_gateway/CMakeLists.txt
rename to samples/cellular/lte_sensor_gateway/CMakeLists.txt
diff --git a/samples/cellular/lte_ble_gateway/Kconfig b/samples/cellular/lte_sensor_gateway/Kconfig
similarity index 100%
rename from samples/cellular/lte_ble_gateway/Kconfig
rename to samples/cellular/lte_sensor_gateway/Kconfig
diff --git a/samples/cellular/lte_ble_gateway/README.rst b/samples/cellular/lte_sensor_gateway/README.rst
similarity index 99%
rename from samples/cellular/lte_ble_gateway/README.rst
rename to samples/cellular/lte_sensor_gateway/README.rst
index 12137fef4f3f..ee936569fe05 100644
--- a/samples/cellular/lte_ble_gateway/README.rst
+++ b/samples/cellular/lte_sensor_gateway/README.rst
@@ -81,7 +81,7 @@ All LEDs (1-4):
 Building and running
 ********************
 
-.. |sample path| replace:: :file:`samples/cellular/lte_ble_gateway`
+.. |sample path| replace:: :file:`samples/cellular/lte_sensor_gateway`
 
 .. include:: /includes/build_and_run_ns.txt
 
diff --git a/samples/cellular/lte_ble_gateway/boards/nrf9160dk_nrf9160_ns.conf b/samples/cellular/lte_sensor_gateway/boards/nrf9160dk_nrf9160_ns.conf
similarity index 100%
rename from samples/cellular/lte_ble_gateway/boards/nrf9160dk_nrf9160_ns.conf
rename to samples/cellular/lte_sensor_gateway/boards/nrf9160dk_nrf9160_ns.conf
diff --git a/samples/cellular/lte_ble_gateway/boards/nrf9160dk_nrf9160_ns.overlay b/samples/cellular/lte_sensor_gateway/boards/nrf9160dk_nrf9160_ns.overlay
similarity index 100%
rename from samples/cellular/lte_ble_gateway/boards/nrf9160dk_nrf9160_ns.overlay
rename to samples/cellular/lte_sensor_gateway/boards/nrf9160dk_nrf9160_ns.overlay
diff --git a/samples/cellular/lte_ble_gateway/boards/nrf9160dk_nrf9160_ns_0_14_0.overlay b/samples/cellular/lte_sensor_gateway/boards/nrf9160dk_nrf9160_ns_0_14_0.overlay
similarity index 100%
rename from samples/cellular/lte_ble_gateway/boards/nrf9160dk_nrf9160_ns_0_14_0.overlay
rename to samples/cellular/lte_sensor_gateway/boards/nrf9160dk_nrf9160_ns_0_14_0.overlay
diff --git a/samples/cellular/lte_ble_gateway/boards/thingy91_nrf9160_ns.conf b/samples/cellular/lte_sensor_gateway/boards/thingy91_nrf9160_ns.conf
similarity index 100%
rename from samples/cellular/lte_ble_gateway/boards/thingy91_nrf9160_ns.conf
rename to samples/cellular/lte_sensor_gateway/boards/thingy91_nrf9160_ns.conf
diff --git a/samples/cellular/lte_ble_gateway/boards/thingy91_nrf9160_ns.overlay b/samples/cellular/lte_sensor_gateway/boards/thingy91_nrf9160_ns.overlay
similarity index 100%
rename from samples/cellular/lte_ble_gateway/boards/thingy91_nrf9160_ns.overlay
rename to samples/cellular/lte_sensor_gateway/boards/thingy91_nrf9160_ns.overlay
diff --git a/samples/cellular/lte_ble_gateway/debug.config.conf b/samples/cellular/lte_sensor_gateway/debug.config.conf
similarity index 100%
rename from samples/cellular/lte_ble_gateway/debug.config.conf
rename to samples/cellular/lte_sensor_gateway/debug.config.conf
diff --git a/samples/cellular/lte_ble_gateway/prj.conf b/samples/cellular/lte_sensor_gateway/prj.conf
similarity index 100%
rename from samples/cellular/lte_ble_gateway/prj.conf
rename to samples/cellular/lte_sensor_gateway/prj.conf
diff --git a/samples/cellular/lte_ble_gateway/sample.yaml b/samples/cellular/lte_sensor_gateway/sample.yaml
similarity index 87%
rename from samples/cellular/lte_ble_gateway/sample.yaml
rename to samples/cellular/lte_sensor_gateway/sample.yaml
index 90ff7547579b..ac019ddd9418 100644
--- a/samples/cellular/lte_ble_gateway/sample.yaml
+++ b/samples/cellular/lte_sensor_gateway/sample.yaml
@@ -1,7 +1,7 @@
 sample:
   name: LTE-Bluetooth LE gateway sample
 tests:
-  sample.cellular.lte_ble_gateway:
+  sample.cellular.lte_sensor_gateway:
     sysbuild: true
     build_only: true
     integration_platforms:
diff --git a/samples/cellular/lte_ble_gateway/src/aggregator.c b/samples/cellular/lte_sensor_gateway/src/aggregator.c
similarity index 100%
rename from samples/cellular/lte_ble_gateway/src/aggregator.c
rename to samples/cellular/lte_sensor_gateway/src/aggregator.c
diff --git a/samples/cellular/lte_ble_gateway/src/aggregator.h b/samples/cellular/lte_sensor_gateway/src/aggregator.h
similarity index 100%
rename from samples/cellular/lte_ble_gateway/src/aggregator.h
rename to samples/cellular/lte_sensor_gateway/src/aggregator.h
diff --git a/samples/cellular/lte_ble_gateway/src/alarm.c b/samples/cellular/lte_sensor_gateway/src/alarm.c
similarity index 100%
rename from samples/cellular/lte_ble_gateway/src/alarm.c
rename to samples/cellular/lte_sensor_gateway/src/alarm.c
diff --git a/samples/cellular/lte_ble_gateway/src/alarm.h b/samples/cellular/lte_sensor_gateway/src/alarm.h
similarity index 100%
rename from samples/cellular/lte_ble_gateway/src/alarm.h
rename to samples/cellular/lte_sensor_gateway/src/alarm.h
diff --git a/samples/cellular/lte_ble_gateway/src/ble.c b/samples/cellular/lte_sensor_gateway/src/ble.c
similarity index 100%
rename from samples/cellular/lte_ble_gateway/src/ble.c
rename to samples/cellular/lte_sensor_gateway/src/ble.c
diff --git a/samples/cellular/lte_ble_gateway/src/ble.h b/samples/cellular/lte_sensor_gateway/src/ble.h
similarity index 100%
rename from samples/cellular/lte_ble_gateway/src/ble.h
rename to samples/cellular/lte_sensor_gateway/src/ble.h
diff --git a/samples/cellular/lte_ble_gateway/src/certificates.h b/samples/cellular/lte_sensor_gateway/src/certificates.h
similarity index 100%
rename from samples/cellular/lte_ble_gateway/src/certificates.h
rename to samples/cellular/lte_sensor_gateway/src/certificates.h
diff --git a/samples/cellular/lte_ble_gateway/src/main.c b/samples/cellular/lte_sensor_gateway/src/main.c
similarity index 100%
rename from samples/cellular/lte_ble_gateway/src/main.c
rename to samples/cellular/lte_sensor_gateway/src/main.c
diff --git a/samples/cellular/nrf_provisioning/CMakeLists.txt b/samples/cellular/nrf_device_provisioning/CMakeLists.txt
similarity index 100%
rename from samples/cellular/nrf_provisioning/CMakeLists.txt
rename to samples/cellular/nrf_device_provisioning/CMakeLists.txt
diff --git a/samples/cellular/nrf_provisioning/Kconfig b/samples/cellular/nrf_device_provisioning/Kconfig
similarity index 100%
rename from samples/cellular/nrf_provisioning/Kconfig
rename to samples/cellular/nrf_device_provisioning/Kconfig
diff --git a/samples/cellular/nrf_provisioning/README.rst b/samples/cellular/nrf_device_provisioning/README.rst
similarity index 98%
rename from samples/cellular/nrf_provisioning/README.rst
rename to samples/cellular/nrf_device_provisioning/README.rst
index ac9a72019446..5619f0c6a259 100644
--- a/samples/cellular/nrf_provisioning/README.rst
+++ b/samples/cellular/nrf_device_provisioning/README.rst
@@ -119,7 +119,7 @@ The following files are available:
 Building and running
 ********************
 
-.. |sample path| replace:: :file:`samples/cellular/nrf_provisioning`
+.. |sample path| replace:: :file:`samples/cellular/nrf_device_provisioning`
 
 .. include:: /includes/build_and_run_ns.txt
 
diff --git a/samples/cellular/nrf_provisioning/overlay-at_shell.conf b/samples/cellular/nrf_device_provisioning/overlay-at_shell.conf
similarity index 100%
rename from samples/cellular/nrf_provisioning/overlay-at_shell.conf
rename to samples/cellular/nrf_device_provisioning/overlay-at_shell.conf
diff --git a/samples/cellular/nrf_provisioning/overlay-coap.conf b/samples/cellular/nrf_device_provisioning/overlay-coap.conf
similarity index 100%
rename from samples/cellular/nrf_provisioning/overlay-coap.conf
rename to samples/cellular/nrf_device_provisioning/overlay-coap.conf
diff --git a/samples/cellular/nrf_provisioning/prj.conf b/samples/cellular/nrf_device_provisioning/prj.conf
similarity index 100%
rename from samples/cellular/nrf_provisioning/prj.conf
rename to samples/cellular/nrf_device_provisioning/prj.conf
diff --git a/samples/cellular/nrf_provisioning/sample.yaml b/samples/cellular/nrf_device_provisioning/sample.yaml
similarity index 88%
rename from samples/cellular/nrf_provisioning/sample.yaml
rename to samples/cellular/nrf_device_provisioning/sample.yaml
index e4038595361f..966a799173ea 100644
--- a/samples/cellular/nrf_provisioning/sample.yaml
+++ b/samples/cellular/nrf_device_provisioning/sample.yaml
@@ -1,7 +1,7 @@
 sample:
   name: nRF Device Provisioning
 tests:
-  sample.cellular.nrf_provisioning:
+  sample.cellular.nrf_device_provisioning:
     sysbuild: true
     build_only: true
     integration_platforms:
diff --git a/samples/cellular/nrf_provisioning/src/main.c b/samples/cellular/nrf_device_provisioning/src/main.c
similarity index 100%
rename from samples/cellular/nrf_provisioning/src/main.c
rename to samples/cellular/nrf_device_provisioning/src/main.c
diff --git a/samples/bootloader/CMakeLists.txt b/samples/nsib/CMakeLists.txt
similarity index 92%
rename from samples/bootloader/CMakeLists.txt
rename to samples/nsib/CMakeLists.txt
index 764d1c717842..91f36036952d 100644
--- a/samples/bootloader/CMakeLists.txt
+++ b/samples/nsib/CMakeLists.txt
@@ -7,6 +7,6 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(bootloader)
+project(nsib)
 
 zephyr_library_sources(src/main.c)
diff --git a/samples/bootloader/README.rst b/samples/nsib/README.rst
similarity index 98%
rename from samples/bootloader/README.rst
rename to samples/nsib/README.rst
index 8563afb1450b..52dbabb2aff1 100644
--- a/samples/bootloader/README.rst
+++ b/samples/nsib/README.rst
@@ -93,7 +93,7 @@ For information how to erase the entire flash memory when flashing, see :ref:`pr
 Flash memory layout
 ===================
 
-The flash memory layout is defined by the :file:`samples/bootloader/pm.yml` file, which establishes four main partitions:
+The flash memory layout is defined by the :file:`samples/nsib/pm.yml` file, which establishes four main partitions:
 
 * *B0* - The NSIB image.
 * *Provision* - The provisioned data.
@@ -164,7 +164,7 @@ To set options for child images, such as NSIB and MCUboot, see the :ref:`ug_mult
 Building and running
 ********************
 
-.. |sample path| replace:: :file:`samples/bootloader`
+.. |sample path| replace:: :file:`samples/nsib`
 
 .. include:: /includes/build_and_run.txt
 
diff --git a/samples/bootloader/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/nsib/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
similarity index 100%
rename from samples/bootloader/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
rename to samples/nsib/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
diff --git a/samples/bootloader/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/nsib/boards/nrf5340dk_nrf5340_cpuapp.conf
similarity index 100%
rename from samples/bootloader/boards/nrf5340dk_nrf5340_cpuapp.conf
rename to samples/nsib/boards/nrf5340dk_nrf5340_cpuapp.conf
diff --git a/samples/bootloader/boards/nrf5340dk_nrf5340_cpuapp_minimal.conf b/samples/nsib/boards/nrf5340dk_nrf5340_cpuapp_minimal.conf
similarity index 100%
rename from samples/bootloader/boards/nrf5340dk_nrf5340_cpuapp_minimal.conf
rename to samples/nsib/boards/nrf5340dk_nrf5340_cpuapp_minimal.conf
diff --git a/samples/bootloader/boards/thingy91x_nrf5340_cpuapp.conf b/samples/nsib/boards/thingy91x_nrf5340_cpuapp.conf
similarity index 100%
rename from samples/bootloader/boards/thingy91x_nrf5340_cpuapp.conf
rename to samples/nsib/boards/thingy91x_nrf5340_cpuapp.conf
diff --git a/samples/bootloader/boards/thingy91x_nrf5340_cpuapp_minimal.conf b/samples/nsib/boards/thingy91x_nrf5340_cpuapp_minimal.conf
similarity index 100%
rename from samples/bootloader/boards/thingy91x_nrf5340_cpuapp_minimal.conf
rename to samples/nsib/boards/thingy91x_nrf5340_cpuapp_minimal.conf
diff --git a/samples/bootloader/pm.yml b/samples/nsib/pm.yml
similarity index 100%
rename from samples/bootloader/pm.yml
rename to samples/nsib/pm.yml
diff --git a/samples/bootloader/prj.conf b/samples/nsib/prj.conf
similarity index 100%
rename from samples/bootloader/prj.conf
rename to samples/nsib/prj.conf
diff --git a/samples/bootloader/prj_minimal.conf b/samples/nsib/prj_minimal.conf
similarity index 100%
rename from samples/bootloader/prj_minimal.conf
rename to samples/nsib/prj_minimal.conf
diff --git a/samples/bootloader/sample.yaml b/samples/nsib/sample.yaml
similarity index 97%
rename from samples/bootloader/sample.yaml
rename to samples/nsib/sample.yaml
index 9cd170397bbf..4e144ec34708 100644
--- a/samples/bootloader/sample.yaml
+++ b/samples/nsib/sample.yaml
@@ -1,7 +1,7 @@
 sample:
   name: Bootloader Sample
 tests:
-  sample.bootloader:
+  sample.nsib:
     sysbuild: true
     build_only: true
     integration_platforms:
diff --git a/samples/bootloader/src/main.c b/samples/nsib/src/main.c
similarity index 100%
rename from samples/bootloader/src/main.c
rename to samples/nsib/src/main.c
diff --git a/scripts/ci/tags.yaml b/scripts/ci/tags.yaml
index fe0b06a6d43f..4fb0bbe02a18 100644
--- a/scripts/ci/tags.yaml
+++ b/scripts/ci/tags.yaml
@@ -691,7 +691,7 @@ ci_tests_subsys_bootloader:
     - nrf/lib/identity_key/
     - nrf/lib/modem_antenna/
     - nrf/lib/nrf_modem_lib/
-    - nrf/samples/bootloader/
+    - nrf/samples/nsib/
     - nrf/subsys/bootloader/
     - nrf/subsys/fw_info/
     - nrf/subsys/nrf_security/
@@ -1294,7 +1294,7 @@ ci_tests_drivers_egpio:
 ci_tests_drivers_fprotect:
   files:
     - nrf/lib/fprotect/
-    - nrf/samples/bootloader/
+    - nrf/samples/nsib/
     - nrf/subsys/bootloader/
     - nrf/tests/drivers/fprotect/
     - zephyr/subsys/storage/
@@ -1327,7 +1327,7 @@ ci_samples_peripheral_lpuart:
 ci_samples_bootloader:
   files:
     - nrf/lib/fprotect/
-    - nrf/samples/bootloader/
+    - nrf/samples/nsib/
     - nrf/subsys/bootloader/
     - nrf/subsys/fw_info/
 
diff --git a/scripts/partition_manager/partition_manager.rst b/scripts/partition_manager/partition_manager.rst
index b6d49371eeec..8fc9d1da7e66 100644
--- a/scripts/partition_manager/partition_manager.rst
+++ b/scripts/partition_manager/partition_manager.rst
@@ -741,7 +741,7 @@ For example, if you generate a partition placement report on the build of :file:
    | 0xff000: EMPTY_2 (0x1000)                |
    +------------------------------------------+
 
-The sizes of each partition are determined by the associated :file:`pm.yml` file, such as :file:`nrf/samples/bootloader/pm.yml` for |NSIB| and :file:`bootloader/mcuboot/boot/zephyr/pm.yml` for MCUboot.
+The sizes of each partition are determined by the associated :file:`pm.yml` file, such as :file:`nrf/samples/nsib/pm.yml` for |NSIB| and :file:`bootloader/mcuboot/boot/zephyr/pm.yml` for MCUboot.
 
 .. _ug_pm_static:
 
diff --git a/scripts/quarantine_integration.yaml b/scripts/quarantine_integration.yaml
index 00b633823706..991dfd4b2be1 100644
--- a/scripts/quarantine_integration.yaml
+++ b/scripts/quarantine_integration.yaml
@@ -212,7 +212,7 @@
   comment: "Configurations excluded to limit resources usage in integration builds"
 
 - scenarios:
-    - sample.bluetooth.mesh.sensor_client
+    - sample.bluetooth.mesh.sensor_observer
   platforms:
     - nrf21540dk/nrf52840
     - nrf52840dk/nrf52840
@@ -926,7 +926,7 @@
   comment: "Configurations excluded to limit resources usage in integration builds"
 
 - scenarios:
-    - sample.bluetooth.central_and_peripheral_hr.build
+    - sample.bluetooth.central_and_peripheral_hrs.build
   platforms:
     - nrf52840dk/nrf52840
     - nrf5340dk/nrf5340/cpuapp
diff --git a/subsys/net/lib/Kconfig b/subsys/net/lib/Kconfig
index 1f8ea1aba3e7..ea4cf77a4c30 100644
--- a/subsys/net/lib/Kconfig
+++ b/subsys/net/lib/Kconfig
@@ -46,7 +46,7 @@ rsource "softap_wifi_provision/Kconfig"
 rsource "wifi_mgmt_ext/Kconfig"
 rsource "wifi_ready/Kconfig"
 rsource "mqtt_helper/Kconfig"
-rsource "nrf_provisioning/Kconfig"
+rsource "nrf_device_provisioning/Kconfig"
 rsource "mcumgr_smp_client/Kconfig"
 rsource "nrf70_fw_ext/Kconfig"
 rsource "hostap_crypto/Kconfig"
diff --git a/sysbuild/secureboot.cmake b/sysbuild/secureboot.cmake
index 78cec33b835b..9fae6d4857a1 100644
--- a/sysbuild/secureboot.cmake
+++ b/sysbuild/secureboot.cmake
@@ -39,7 +39,7 @@ if(SB_CONFIG_SECURE_BOOT)
   endif()
 
   if(SB_CONFIG_SECURE_BOOT_APPCORE)
-    set(secure_boot_source_dir ${ZEPHYR_NRF_MODULE_DIR}/samples/bootloader)
+    set(secure_boot_source_dir ${ZEPHYR_NRF_MODULE_DIR}/samples/nsib)
 
     ExternalZephyrProject_Add(
       APPLICATION b0
diff --git a/tests/subsys/bluetooth/mesh/light_ctrl/testcase.yaml b/tests/subsys/bluetooth/mesh/light_ctrl/testcase.yaml
index 04e33d8fecfc..7f2190f4e49a 100644
--- a/tests/subsys/bluetooth/mesh/light_ctrl/testcase.yaml
+++ b/tests/subsys/bluetooth/mesh/light_ctrl/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  bluetooth.mesh.light_ctrl:
+  bluetooth.mesh.light_fixture:
     sysbuild: true
     platform_allow:
       - native_sim
diff --git a/tests/subsys/net/lib/nrf_provisioning/testcase.yaml b/tests/subsys/net/lib/nrf_provisioning/testcase.yaml
index 3e0637f7f87d..2a3d3ba469a7 100644
--- a/tests/subsys/net/lib/nrf_provisioning/testcase.yaml
+++ b/tests/subsys/net/lib/nrf_provisioning/testcase.yaml
@@ -1,5 +1,5 @@
 tests:
-  nrf_provisioning.unittest_jwt:
+  nrf_device_provisioning.unittest_jwt:
     sysbuild: true
     extra_args: FILE_SUFFIX=jwt
     platform_allow: native_sim
@@ -9,7 +9,7 @@ tests:
       - unittest
       - sysbuild
       - ci_tests_subsys_net
-  nrf_provisioning.unittest_http:
+  nrf_device_provisioning.unittest_http:
     sysbuild: true
     platform_allow: native_sim
     integration_platforms:
@@ -18,7 +18,7 @@ tests:
       - unittest
       - sysbuild
       - ci_tests_subsys_net
-  nrf_provisioning.unittest_coap:
+  nrf_device_provisioning.unittest_coap:
     sysbuild: true
     extra_args: FILE_SUFFIX=coap
     platform_allow: native_sim