diff --git a/level_zero/core/source/device/device_imp.h b/level_zero/core/source/device/device_imp.h
index c830553ed9..ea1317aa78 100644
--- a/level_zero/core/source/device/device_imp.h
+++ b/level_zero/core/source/device/device_imp.h
@@ -30,7 +30,7 @@ struct SysmanDevice;
 struct FabricVertex;
 class CacheReservation;
 
-struct DeviceImp : public Device, NEO::NonCopyableOrMovableClass {
+struct DeviceImp : public Device, NEO::NonCopyableAndNonMovableClass {
     DeviceImp();
     ze_result_t getStatus() override;
     ze_result_t submitCopyForP2P(ze_device_handle_t hPeerDevice, ze_bool_t *value);
@@ -196,7 +196,7 @@ struct DeviceImp : public Device, NEO::NonCopyableOrMovableClass {
     std::unique_ptr<DebugSession> debugSession;
 };
 
-static_assert(NEO::NonCopyableOrMovable<DeviceImp>);
+static_assert(NEO::NonCopyableAndNonMovable<DeviceImp>);
 
 void transferAndUnprotectMemoryWithHints(NEO::CpuPageFaultManager *pageFaultHandler, void *allocPtr, NEO::CpuPageFaultManager::PageFaultData &pageFaultData);
 
diff --git a/level_zero/core/source/image/image_imp.h b/level_zero/core/source/image/image_imp.h
index ed019b5cc6..67d05f0210 100644
--- a/level_zero/core/source/image/image_imp.h
+++ b/level_zero/core/source/image/image_imp.h
@@ -17,7 +17,7 @@
 
 namespace L0 {
 
-struct ImageImp : public Image, NEO::NonCopyableOrMovableClass {
+struct ImageImp : public Image, NEO::NonCopyableAndNonMovableClass {
     ze_result_t destroy() override;
     ze_result_t destroyPeerImages(const void *ptr, Device *device) override;
 
@@ -74,6 +74,6 @@ struct ImageImp : public Image, NEO::NonCopyableOrMovableClass {
     bool mimickedImagefor3Ch = false;
 };
 
-static_assert(NEO::NonCopyableOrMovable<ImageImp>);
+static_assert(NEO::NonCopyableAndNonMovable<ImageImp>);
 
 } // namespace L0
diff --git a/level_zero/core/source/semaphore/external_semaphore_imp.h b/level_zero/core/source/semaphore/external_semaphore_imp.h
index 36ccf8b75e..9980eb4161 100644
--- a/level_zero/core/source/semaphore/external_semaphore_imp.h
+++ b/level_zero/core/source/semaphore/external_semaphore_imp.h
@@ -35,7 +35,7 @@ class ExternalSemaphoreImp : public ExternalSemaphore {
     const ze_intel_external_semaphore_exp_desc_t *desc;
 };
 
-class ExternalSemaphoreController : NEO::NonCopyableOrMovableClass {
+class ExternalSemaphoreController : NEO::NonCopyableAndNonMovableClass {
   public:
     enum SemaphoreOperation {
         Wait,
@@ -99,6 +99,6 @@ class ExternalSemaphoreController : NEO::NonCopyableOrMovableClass {
     std::thread extSemThread;
 };
 
-static_assert(NEO::NonCopyableOrMovable<ExternalSemaphoreController>);
+static_assert(NEO::NonCopyableAndNonMovable<ExternalSemaphoreController>);
 
 } // namespace L0
diff --git a/level_zero/sysman/source/api/diagnostics/linux/sysman_os_diagnostics_imp.h b/level_zero/sysman/source/api/diagnostics/linux/sysman_os_diagnostics_imp.h
index b95512be3f..e090c7bca0 100644
--- a/level_zero/sysman/source/api/diagnostics/linux/sysman_os_diagnostics_imp.h
+++ b/level_zero/sysman/source/api/diagnostics/linux/sysman_os_diagnostics_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,7 @@ namespace Sysman {
 class FirmwareUtil;
 class SysFsAccessInterface;
 
-class LinuxDiagnosticsImp : public OsDiagnostics, NEO::NonCopyableOrMovableClass {
+class LinuxDiagnosticsImp : public OsDiagnostics, NEO::NonCopyableAndNonMovableClass {
   public:
     void osGetDiagProperties(zes_diag_properties_t *pProperties) override;
     ze_result_t osGetDiagTests(uint32_t *pCount, zes_diag_test_t *pTests) override;
diff --git a/level_zero/sysman/source/api/diagnostics/sysman_diagnostics_imp.h b/level_zero/sysman/source/api/diagnostics/sysman_diagnostics_imp.h
index 54910400b9..ee5b29d25b 100644
--- a/level_zero/sysman/source/api/diagnostics/sysman_diagnostics_imp.h
+++ b/level_zero/sysman/source/api/diagnostics/sysman_diagnostics_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -16,7 +16,7 @@
 namespace L0 {
 namespace Sysman {
 
-class DiagnosticsImp : public Diagnostics, NEO::NonCopyableOrMovableClass {
+class DiagnosticsImp : public Diagnostics, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t diagnosticsGetProperties(zes_diag_properties_t *pProperties) override;
     ze_result_t diagnosticsGetTests(uint32_t *pCount, zes_diag_test_t *pTests) override;
diff --git a/level_zero/sysman/source/api/ecc/sysman_ecc_imp.h b/level_zero/sysman/source/api/ecc/sysman_ecc_imp.h
index c41e137a89..78d1dfd012 100644
--- a/level_zero/sysman/source/api/ecc/sysman_ecc_imp.h
+++ b/level_zero/sysman/source/api/ecc/sysman_ecc_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,7 +19,7 @@ struct OsSysman;
 static constexpr uint8_t eccStateDisable = 0;
 static constexpr uint8_t eccStateEnable = 1;
 static constexpr uint8_t eccStateNone = 0xFF;
-class EccImp : public Ecc, NEO::NonCopyableOrMovableClass {
+class EccImp : public Ecc, NEO::NonCopyableAndNonMovableClass {
   public:
     void init() override {}
     ze_result_t deviceEccAvailable(ze_bool_t *pAvailable) override;
diff --git a/level_zero/sysman/source/api/engine/linux/sysman_os_engine_imp.h b/level_zero/sysman/source/api/engine/linux/sysman_os_engine_imp.h
index 36d4a5643a..72d94dda42 100644
--- a/level_zero/sysman/source/api/engine/linux/sysman_os_engine_imp.h
+++ b/level_zero/sysman/source/api/engine/linux/sysman_os_engine_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -20,7 +20,7 @@ namespace Sysman {
 class SysmanKmdInterface;
 class PmuInterface;
 struct Device;
-class LinuxEngineImp : public OsEngine, NEO::NonCopyableOrMovableClass {
+class LinuxEngineImp : public OsEngine, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getActivity(zes_engine_stats_t *pStats) override;
     ze_result_t getActivityExt(uint32_t *pCount, zes_engine_stats_t *pStats) override {
diff --git a/level_zero/sysman/source/api/engine/sysman_engine_imp.h b/level_zero/sysman/source/api/engine/sysman_engine_imp.h
index a95b9a20fc..8040fd707e 100644
--- a/level_zero/sysman/source/api/engine/sysman_engine_imp.h
+++ b/level_zero/sysman/source/api/engine/sysman_engine_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 namespace L0 {
 namespace Sysman {
 
-class EngineImp : public Engine, NEO::NonCopyableOrMovableClass {
+class EngineImp : public Engine, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t engineGetProperties(zes_engine_properties_t *pProperties) override;
     ze_result_t engineGetActivity(zes_engine_stats_t *pStats) override;
diff --git a/level_zero/sysman/source/api/engine/windows/sysman_os_engine_imp.h b/level_zero/sysman/source/api/engine/windows/sysman_os_engine_imp.h
index dad5edb2bb..2b8fdc72d5 100644
--- a/level_zero/sysman/source/api/engine/windows/sysman_os_engine_imp.h
+++ b/level_zero/sysman/source/api/engine/windows/sysman_os_engine_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 namespace L0 {
 namespace Sysman {
 class KmdSysManager;
-class WddmEngineImp : public OsEngine, NEO::NonCopyableOrMovableClass {
+class WddmEngineImp : public OsEngine, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getActivity(zes_engine_stats_t *pStats) override;
     ze_result_t getActivityExt(uint32_t *pCount, zes_engine_stats_t *pStats) override;
diff --git a/level_zero/sysman/source/api/events/linux/sysman_os_events_imp.h b/level_zero/sysman/source/api/events/linux/sysman_os_events_imp.h
index d52148c38a..aeadddb361 100644
--- a/level_zero/sysman/source/api/events/linux/sysman_os_events_imp.h
+++ b/level_zero/sysman/source/api/events/linux/sysman_os_events_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@ namespace Sysman {
 
 class LinuxSysmanDriverImp;
 
-class LinuxEventsImp : public OsEvents, NEO::NonCopyableOrMovableClass {
+class LinuxEventsImp : public OsEvents, NEO::NonCopyableAndNonMovableClass {
   public:
     bool eventListen(zes_event_type_flags_t &pEvent, uint64_t timeout) override;
     ze_result_t eventRegister(zes_event_type_flags_t events) override;
diff --git a/level_zero/sysman/source/api/events/sysman_events_imp.h b/level_zero/sysman/source/api/events/sysman_events_imp.h
index 913f8ae10e..f2f6ac9ea4 100644
--- a/level_zero/sysman/source/api/events/sysman_events_imp.h
+++ b/level_zero/sysman/source/api/events/sysman_events_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -16,7 +16,7 @@
 namespace L0 {
 namespace Sysman {
 
-class EventsImp : public Events, NEO::NonCopyableOrMovableClass {
+class EventsImp : public Events, NEO::NonCopyableAndNonMovableClass {
   public:
     void init() override;
     ze_result_t eventRegister(zes_event_type_flags_t events) override;
diff --git a/level_zero/sysman/source/api/events/windows/sysman_os_events_imp.h b/level_zero/sysman/source/api/events/windows/sysman_os_events_imp.h
index 2815d25c5c..7d81ed4d72 100644
--- a/level_zero/sysman/source/api/events/windows/sysman_os_events_imp.h
+++ b/level_zero/sysman/source/api/events/windows/sysman_os_events_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -22,7 +22,7 @@ struct EventHandler {
     uint32_t requestId;
 };
 
-class WddmEventsImp : public OsEvents, NEO::NonCopyableOrMovableClass {
+class WddmEventsImp : public OsEvents, NEO::NonCopyableAndNonMovableClass {
   public:
     bool eventListen(zes_event_type_flags_t &pEvent, uint64_t timeout) override;
     ze_result_t eventRegister(zes_event_type_flags_t events) override;
diff --git a/level_zero/sysman/source/api/fabric_port/linux/sysman_fabric_device_access.h b/level_zero/sysman/source/api/fabric_port/linux/sysman_fabric_device_access.h
index fc19963860..4c27d8de54 100644
--- a/level_zero/sysman/source/api/fabric_port/linux/sysman_fabric_device_access.h
+++ b/level_zero/sysman/source/api/fabric_port/linux/sysman_fabric_device_access.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -18,7 +18,7 @@ namespace Sysman {
 
 struct OsSysman;
 
-class FabricDeviceAccess : NEO::NonCopyableOrMovableClass {
+class FabricDeviceAccess : NEO::NonCopyableAndNonMovableClass {
   public:
     virtual ze_result_t getState(const zes_fabric_port_id_t portId, zes_fabric_port_state_t &state) = 0;
     virtual ze_result_t getThroughput(const zes_fabric_port_id_t portId, zes_fabric_port_throughput_t &througput) = 0;
diff --git a/level_zero/sysman/source/api/fabric_port/linux/sysman_os_fabric_port_imp.h b/level_zero/sysman/source/api/fabric_port/linux/sysman_os_fabric_port_imp.h
index 6dcb6d9bc8..ac971c50e1 100644
--- a/level_zero/sysman/source/api/fabric_port/linux/sysman_os_fabric_port_imp.h
+++ b/level_zero/sysman/source/api/fabric_port/linux/sysman_os_fabric_port_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,7 @@
 namespace L0 {
 namespace Sysman {
 class LinuxSysmanImp;
-class LinuxFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableOrMovableClass {
+class LinuxFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableAndNonMovableClass {
   public:
     uint32_t getNumPorts() override;
     ze_result_t getMultiPortThroughput(std::vector<zes_fabric_port_id_t> &portIdList, zes_fabric_port_throughput_t **pThroughput) override;
@@ -59,7 +59,7 @@ class LinuxFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableOrMovableCla
     FabricDeviceAccess *pFabricDeviceAccess = nullptr;
 };
 
-class LinuxFabricPortImp : public OsFabricPort, NEO::NonCopyableOrMovableClass {
+class LinuxFabricPortImp : public OsFabricPort, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_fabric_port_properties_t *pProperties) override;
     ze_result_t getLinkType(zes_fabric_link_type_t *pLinkType) override;
diff --git a/level_zero/sysman/source/api/fabric_port/sysman_fabric_port.h b/level_zero/sysman/source/api/fabric_port/sysman_fabric_port.h
index b696dae405..1443be32a6 100644
--- a/level_zero/sysman/source/api/fabric_port/sysman_fabric_port.h
+++ b/level_zero/sysman/source/api/fabric_port/sysman_fabric_port.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -46,7 +46,7 @@ class FabricPort : _zes_fabric_port_handle_t {
     }
 };
 
-struct FabricPortHandleContext : NEO::NonCopyableOrMovableClass {
+struct FabricPortHandleContext : NEO::NonCopyableAndNonMovableClass {
     FabricPortHandleContext(OsSysman *pOsSysman);
     ~FabricPortHandleContext();
 
diff --git a/level_zero/sysman/source/api/fabric_port/sysman_fabric_port_imp.h b/level_zero/sysman/source/api/fabric_port/sysman_fabric_port_imp.h
index 8923a6d0fb..8a5e536108 100644
--- a/level_zero/sysman/source/api/fabric_port/sysman_fabric_port_imp.h
+++ b/level_zero/sysman/source/api/fabric_port/sysman_fabric_port_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -16,7 +16,7 @@
 namespace L0 {
 namespace Sysman {
 
-class FabricDeviceImp : public FabricDevice, NEO::NonCopyableOrMovableClass {
+class FabricDeviceImp : public FabricDevice, NEO::NonCopyableAndNonMovableClass {
   public:
     FabricDeviceImp() = delete;
     FabricDeviceImp(OsSysman *pOsSysman);
@@ -28,7 +28,7 @@ class FabricDeviceImp : public FabricDevice, NEO::NonCopyableOrMovableClass {
     OsFabricDevice *pOsFabricDevice = nullptr;
 };
 
-class FabricPortImp : public FabricPort, NEO::NonCopyableOrMovableClass {
+class FabricPortImp : public FabricPort, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t fabricPortGetProperties(zes_fabric_port_properties_t *pProperties) override;
     ze_result_t fabricPortGetLinkType(zes_fabric_link_type_t *pLinkType) override;
diff --git a/level_zero/sysman/source/api/fabric_port/windows/sysman_os_fabric_port_imp.h b/level_zero/sysman/source/api/fabric_port/windows/sysman_os_fabric_port_imp.h
index d216810cdd..6ea5ff5eb6 100644
--- a/level_zero/sysman/source/api/fabric_port/windows/sysman_os_fabric_port_imp.h
+++ b/level_zero/sysman/source/api/fabric_port/windows/sysman_os_fabric_port_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 namespace L0 {
 namespace Sysman {
 
-class WddmFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableOrMovableClass {
+class WddmFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableAndNonMovableClass {
   public:
     uint32_t getNumPorts() override;
     ze_result_t getMultiPortThroughput(std::vector<zes_fabric_port_id_t> &portIdList, zes_fabric_port_throughput_t **pThroughput) override;
@@ -27,7 +27,7 @@ class WddmFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableOrMovableClas
     uint32_t numPorts = 0;
 };
 
-class WddmFabricPortImp : public OsFabricPort, NEO::NonCopyableOrMovableClass {
+class WddmFabricPortImp : public OsFabricPort, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_fabric_port_properties_t *pProperties) override;
     ze_result_t getLinkType(zes_fabric_link_type_t *pLinkType) override;
diff --git a/level_zero/sysman/source/api/fan/linux/sysman_os_fan_imp.h b/level_zero/sysman/source/api/fan/linux/sysman_os_fan_imp.h
index 7f63ce9895..458272526d 100644
--- a/level_zero/sysman/source/api/fan/linux/sysman_os_fan_imp.h
+++ b/level_zero/sysman/source/api/fan/linux/sysman_os_fan_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@ namespace Sysman {
 
 class SysfsAccess;
 
-class LinuxFanImp : public OsFan, NEO::NonCopyableOrMovableClass {
+class LinuxFanImp : public OsFan, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_fan_properties_t *pProperties) override;
     ze_result_t getConfig(zes_fan_config_t *pConfig) override;
diff --git a/level_zero/sysman/source/api/fan/sysman_fan_imp.h b/level_zero/sysman/source/api/fan/sysman_fan_imp.h
index 072d9cb095..5c6ac60341 100644
--- a/level_zero/sysman/source/api/fan/sysman_fan_imp.h
+++ b/level_zero/sysman/source/api/fan/sysman_fan_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 
 namespace L0 {
 namespace Sysman {
-class FanImp : public Fan, NEO::NonCopyableOrMovableClass {
+class FanImp : public Fan, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t fanGetProperties(zes_fan_properties_t *pProperties) override;
     ze_result_t fanGetConfig(zes_fan_config_t *pConfig) override;
diff --git a/level_zero/sysman/source/api/fan/windows/sysman_os_fan_imp.h b/level_zero/sysman/source/api/fan/windows/sysman_os_fan_imp.h
index 6f85aa9746..45de91e738 100644
--- a/level_zero/sysman/source/api/fan/windows/sysman_os_fan_imp.h
+++ b/level_zero/sysman/source/api/fan/windows/sysman_os_fan_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@ namespace L0 {
 namespace Sysman {
 
 class KmdSysManager;
-class WddmFanImp : public OsFan, NEO::NonCopyableOrMovableClass {
+class WddmFanImp : public OsFan, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_fan_properties_t *pProperties) override;
     ze_result_t getConfig(zes_fan_config_t *pConfig) override;
diff --git a/level_zero/sysman/source/api/firmware/linux/sysman_os_firmware_imp.h b/level_zero/sysman/source/api/firmware/linux/sysman_os_firmware_imp.h
index 3a7113ce20..d57877a67c 100644
--- a/level_zero/sysman/source/api/firmware/linux/sysman_os_firmware_imp.h
+++ b/level_zero/sysman/source/api/firmware/linux/sysman_os_firmware_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -18,7 +18,7 @@ namespace Sysman {
 class FirmwareUtil;
 class SysFsAccessInterface;
 
-class LinuxFirmwareImp : public OsFirmware, NEO::NonCopyableOrMovableClass {
+class LinuxFirmwareImp : public OsFirmware, NEO::NonCopyableAndNonMovableClass {
   public:
     void osGetFwProperties(zes_firmware_properties_t *pProperties) override;
     ze_result_t osFirmwareFlash(void *pImage, uint32_t size) override;
diff --git a/level_zero/sysman/source/api/firmware/sysman_firmware_imp.h b/level_zero/sysman/source/api/firmware/sysman_firmware_imp.h
index 660031f4dd..bcc1424ccd 100644
--- a/level_zero/sysman/source/api/firmware/sysman_firmware_imp.h
+++ b/level_zero/sysman/source/api/firmware/sysman_firmware_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -18,7 +18,7 @@ namespace Sysman {
 
 class OsFirmware;
 
-class FirmwareImp : public Firmware, NEO::NonCopyableOrMovableClass {
+class FirmwareImp : public Firmware, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t firmwareGetProperties(zes_firmware_properties_t *pProperties) override;
     ze_result_t firmwareFlash(void *pImage, uint32_t size) override;
diff --git a/level_zero/sysman/source/api/frequency/linux/sysman_os_frequency_imp.h b/level_zero/sysman/source/api/frequency/linux/sysman_os_frequency_imp.h
index 5381db681d..3beb8093f7 100644
--- a/level_zero/sysman/source/api/frequency/linux/sysman_os_frequency_imp.h
+++ b/level_zero/sysman/source/api/frequency/linux/sysman_os_frequency_imp.h
@@ -20,7 +20,7 @@ class SysmanKmdInterface;
 class SysmanProductHelper;
 class SysFsAccessInterface;
 
-class LinuxFrequencyImp : public OsFrequency, NEO::NonCopyableOrMovableClass {
+class LinuxFrequencyImp : public OsFrequency, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t osFrequencyGetProperties(zes_freq_properties_t &properties) override;
     double osFrequencyGetStepSize() override;
diff --git a/level_zero/sysman/source/api/frequency/sysman_frequency_imp.h b/level_zero/sysman/source/api/frequency/sysman_frequency_imp.h
index 7d6fda9003..4686a716b5 100644
--- a/level_zero/sysman/source/api/frequency/sysman_frequency_imp.h
+++ b/level_zero/sysman/source/api/frequency/sysman_frequency_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -16,7 +16,7 @@
 namespace L0 {
 namespace Sysman {
 
-class FrequencyImp : public Frequency, NEO::NonCopyableOrMovableClass {
+class FrequencyImp : public Frequency, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t frequencyGetProperties(zes_freq_properties_t *pProperties) override;
     ze_result_t frequencyGetAvailableClocks(uint32_t *pCount, double *phFrequency) override;
diff --git a/level_zero/sysman/source/api/frequency/windows/sysman_os_frequency_imp.h b/level_zero/sysman/source/api/frequency/windows/sysman_os_frequency_imp.h
index 2beb12fcf9..3390f257c7 100644
--- a/level_zero/sysman/source/api/frequency/windows/sysman_os_frequency_imp.h
+++ b/level_zero/sysman/source/api/frequency/windows/sysman_os_frequency_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -40,7 +40,7 @@ struct KmdThrottleReasons {
 };
 
 class KmdSysManager;
-class WddmFrequencyImp : public OsFrequency, NEO::NonCopyableOrMovableClass {
+class WddmFrequencyImp : public OsFrequency, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t osFrequencyGetProperties(zes_freq_properties_t &properties) override;
     double osFrequencyGetStepSize() override;
diff --git a/level_zero/sysman/source/api/global_operations/linux/sysman_os_global_operations_imp.h b/level_zero/sysman/source/api/global_operations/linux/sysman_os_global_operations_imp.h
index 9214a4d5da..67f29218e9 100644
--- a/level_zero/sysman/source/api/global_operations/linux/sysman_os_global_operations_imp.h
+++ b/level_zero/sysman/source/api/global_operations/linux/sysman_os_global_operations_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -23,7 +23,7 @@ class ProcFsAccessInterface;
 class SysmanKmdInterface;
 constexpr uint32_t maxUuidsPerDevice = 3;
 
-class LinuxGlobalOperationsImp : public OsGlobalOperations, NEO::NonCopyableOrMovableClass {
+class LinuxGlobalOperationsImp : public OsGlobalOperations, NEO::NonCopyableAndNonMovableClass {
   public:
     bool getSerialNumber(char (&serialNumber)[ZES_STRING_PROPERTY_SIZE]) override;
     bool getBoardNumber(char (&boardNumber)[ZES_STRING_PROPERTY_SIZE]) override;
diff --git a/level_zero/sysman/source/api/global_operations/sysman_global_operations_imp.h b/level_zero/sysman/source/api/global_operations/sysman_global_operations_imp.h
index 51c131cd88..ecc0e11bf3 100644
--- a/level_zero/sysman/source/api/global_operations/sysman_global_operations_imp.h
+++ b/level_zero/sysman/source/api/global_operations/sysman_global_operations_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -16,7 +16,7 @@
 namespace L0 {
 namespace Sysman {
 
-class GlobalOperationsImp : public GlobalOperations, NEO::NonCopyableOrMovableClass {
+class GlobalOperationsImp : public GlobalOperations, NEO::NonCopyableAndNonMovableClass {
   public:
     void init() override;
     ze_result_t reset(ze_bool_t force) override;
diff --git a/level_zero/sysman/source/api/global_operations/windows/sysman_os_global_operations_imp.h b/level_zero/sysman/source/api/global_operations/windows/sysman_os_global_operations_imp.h
index 10868b10c1..0701076cea 100644
--- a/level_zero/sysman/source/api/global_operations/windows/sysman_os_global_operations_imp.h
+++ b/level_zero/sysman/source/api/global_operations/windows/sysman_os_global_operations_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 namespace L0 {
 namespace Sysman {
 class KmdSysManager;
-class WddmGlobalOperationsImp : public OsGlobalOperations, NEO::NonCopyableOrMovableClass {
+class WddmGlobalOperationsImp : public OsGlobalOperations, NEO::NonCopyableAndNonMovableClass {
   public:
     bool getSerialNumber(char (&serialNumber)[ZES_STRING_PROPERTY_SIZE]) override;
     bool getBoardNumber(char (&boardNumber)[ZES_STRING_PROPERTY_SIZE]) override;
diff --git a/level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp.h b/level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp.h
index 51a3d725d7..dfc95970f1 100644
--- a/level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp.h
+++ b/level_zero/sysman/source/api/memory/linux/sysman_os_memory_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -23,7 +23,7 @@ class LinuxSysmanImp;
 class SysmanKmdInterface;
 struct SysmanDeviceImp;
 
-class LinuxMemoryImp : public OsMemory, NEO::NonCopyableOrMovableClass {
+class LinuxMemoryImp : public OsMemory, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_mem_properties_t *pProperties) override;
     ze_result_t getBandwidth(zes_mem_bandwidth_t *pBandwidth) override;
diff --git a/level_zero/sysman/source/api/memory/sysman_memory_imp.h b/level_zero/sysman/source/api/memory/sysman_memory_imp.h
index 0b5b7deed2..fd0d09814a 100644
--- a/level_zero/sysman/source/api/memory/sysman_memory_imp.h
+++ b/level_zero/sysman/source/api/memory/sysman_memory_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 namespace L0 {
 namespace Sysman {
 
-class MemoryImp : public Memory, NEO::NonCopyableOrMovableClass {
+class MemoryImp : public Memory, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t memoryGetProperties(zes_mem_properties_t *pProperties) override;
     ze_result_t memoryGetBandwidth(zes_mem_bandwidth_t *pBandwidth) override;
diff --git a/level_zero/sysman/source/api/memory/windows/sysman_os_memory_imp.h b/level_zero/sysman/source/api/memory/windows/sysman_os_memory_imp.h
index 8c8221e882..486d7e8f47 100644
--- a/level_zero/sysman/source/api/memory/windows/sysman_os_memory_imp.h
+++ b/level_zero/sysman/source/api/memory/windows/sysman_os_memory_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -22,7 +22,7 @@ typedef PDH_STATUS(__stdcall *fn_PdhCloseQuery)(PDH_HQUERY hQuery);
 
 namespace L0 {
 namespace Sysman {
-class WddmMemoryImp : public OsMemory, NEO::NonCopyableOrMovableClass {
+class WddmMemoryImp : public OsMemory, NEO::NonCopyableAndNonMovableClass {
 
   public:
     ze_result_t getProperties(zes_mem_properties_t *pProperties) override;
diff --git a/level_zero/sysman/source/api/pci/linux/sysman_os_pci_imp.h b/level_zero/sysman/source/api/pci/linux/sysman_os_pci_imp.h
index 88b0a5da36..245368cafb 100644
--- a/level_zero/sysman/source/api/pci/linux/sysman_os_pci_imp.h
+++ b/level_zero/sysman/source/api/pci/linux/sysman_os_pci_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -20,7 +20,7 @@ class SysFsAccessInterface;
 class LinuxSysmanImp;
 struct OsSysman;
 
-class LinuxPciImp : public OsPci, NEO::NonCopyableOrMovableClass {
+class LinuxPciImp : public OsPci, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getPciBdf(zes_pci_properties_t &pciProperties) override;
     void getMaxLinkCaps(double &maxLinkSpeed, int32_t &maxLinkWidth) override;
diff --git a/level_zero/sysman/source/api/pci/sysman_pci_imp.h b/level_zero/sysman/source/api/pci/sysman_pci_imp.h
index 8d3365423b..a9f29964e0 100644
--- a/level_zero/sysman/source/api/pci/sysman_pci_imp.h
+++ b/level_zero/sysman/source/api/pci/sysman_pci_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -18,7 +18,7 @@ namespace Sysman {
 class OsPci;
 struct OsSysman;
 
-class PciImp : public L0::Sysman::Pci, NEO::NonCopyableOrMovableClass {
+class PciImp : public L0::Sysman::Pci, NEO::NonCopyableAndNonMovableClass {
   public:
     void init() override;
     ze_result_t pciStaticProperties(zes_pci_properties_t *pProperties) override;
diff --git a/level_zero/sysman/source/api/pci/windows/sysman_os_pci_imp.h b/level_zero/sysman/source/api/pci/windows/sysman_os_pci_imp.h
index a9071dff03..edfc4a3b33 100644
--- a/level_zero/sysman/source/api/pci/windows/sysman_os_pci_imp.h
+++ b/level_zero/sysman/source/api/pci/windows/sysman_os_pci_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@ namespace L0 {
 namespace Sysman {
 struct OsSysman;
 class KmdSysManager;
-class WddmPciImp : public OsPci, NEO::NonCopyableOrMovableClass {
+class WddmPciImp : public OsPci, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getPciBdf(zes_pci_properties_t &pciProperties) override;
     void getMaxLinkCaps(double &maxLinkSpeed, int32_t &maxLinkWidth) override;
diff --git a/level_zero/sysman/source/api/performance/linux/sysman_os_performance_imp.h b/level_zero/sysman/source/api/performance/linux/sysman_os_performance_imp.h
index 2ca2bd565b..6465499f62 100644
--- a/level_zero/sysman/source/api/performance/linux/sysman_os_performance_imp.h
+++ b/level_zero/sysman/source/api/performance/linux/sysman_os_performance_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,7 @@ namespace Sysman {
 
 class SysmanKmdInterface;
 class SysFsAccessInterface;
-class LinuxPerformanceImp : public OsPerformance, NEO::NonCopyableOrMovableClass {
+class LinuxPerformanceImp : public OsPerformance, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t osPerformanceGetProperties(zes_perf_properties_t &pProperties) override;
     ze_result_t osPerformanceGetConfig(double *pFactor) override;
diff --git a/level_zero/sysman/source/api/performance/sysman_performance_imp.h b/level_zero/sysman/source/api/performance/sysman_performance_imp.h
index 655f9f1bde..1790ff41f1 100644
--- a/level_zero/sysman/source/api/performance/sysman_performance_imp.h
+++ b/level_zero/sysman/source/api/performance/sysman_performance_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 namespace L0 {
 namespace Sysman {
 
-class PerformanceImp : public Performance, NEO::NonCopyableOrMovableClass {
+class PerformanceImp : public Performance, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t performanceGetProperties(zes_perf_properties_t *pProperties) override;
     ze_result_t performanceGetConfig(double *pFactor) override;
diff --git a/level_zero/sysman/source/api/power/linux/sysman_os_power_imp.h b/level_zero/sysman/source/api/power/linux/sysman_os_power_imp.h
index 3b7ee432e0..53659d54c6 100644
--- a/level_zero/sysman/source/api/power/linux/sysman_os_power_imp.h
+++ b/level_zero/sysman/source/api/power/linux/sysman_os_power_imp.h
@@ -21,7 +21,7 @@ class SysFsAccessInterface;
 class SysmanKmdInterface;
 class SysmanProductHelper;
 class LinuxSysmanImp;
-class LinuxPowerImp : public OsPower, NEO::NonCopyableOrMovableClass {
+class LinuxPowerImp : public OsPower, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_power_properties_t *pProperties) override;
     ze_result_t getEnergyCounter(zes_power_energy_counter_t *pEnergy) override;
diff --git a/level_zero/sysman/source/api/power/sysman_power_imp.h b/level_zero/sysman/source/api/power/sysman_power_imp.h
index e4ec996245..c145e08d4a 100644
--- a/level_zero/sysman/source/api/power/sysman_power_imp.h
+++ b/level_zero/sysman/source/api/power/sysman_power_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 namespace L0 {
 namespace Sysman {
 class OsPower;
-class PowerImp : public Power, NEO::NonCopyableOrMovableClass {
+class PowerImp : public Power, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t powerGetProperties(zes_power_properties_t *pProperties) override;
     ze_result_t powerGetEnergyCounter(zes_power_energy_counter_t *pEnergy) override;
diff --git a/level_zero/sysman/source/api/power/windows/sysman_os_power_imp.h b/level_zero/sysman/source/api/power/windows/sysman_os_power_imp.h
index 7e0c9bdd86..14b39d1887 100644
--- a/level_zero/sysman/source/api/power/windows/sysman_os_power_imp.h
+++ b/level_zero/sysman/source/api/power/windows/sysman_os_power_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@ namespace L0 {
 namespace Sysman {
 class KmdSysManager;
 class WddmSysmanImp;
-class WddmPowerImp : public OsPower, NEO::NonCopyableOrMovableClass {
+class WddmPowerImp : public OsPower, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_power_properties_t *pProperties) override;
     ze_result_t getEnergyCounter(zes_power_energy_counter_t *pEnergy) override;
diff --git a/level_zero/sysman/source/api/ras/linux/ras_util/sysman_ras_util.h b/level_zero/sysman/source/api/ras/linux/ras_util/sysman_ras_util.h
index e83680396d..772e8e4643 100644
--- a/level_zero/sysman/source/api/ras/linux/ras_util/sysman_ras_util.h
+++ b/level_zero/sysman/source/api/ras/linux/ras_util/sysman_ras_util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -34,7 +34,7 @@ enum class RasInterfaceType {
     none,
 };
 
-class RasUtil : public NEO::NonCopyableOrMovableClass {
+class RasUtil : public NEO::NonCopyableAndNonMovableClass {
   public:
     RasUtil() = default;
     static std::unique_ptr<RasUtil> create(RasInterfaceType rasInterface, LinuxSysmanImp *pLinuxSysmanImp, zes_ras_error_type_t type, ze_bool_t onSubdevice, uint32_t subdeviceId);
diff --git a/level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp.h b/level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp.h
index 2f16deaac6..7f0429fec9 100644
--- a/level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp.h
+++ b/level_zero/sysman/source/api/ras/linux/sysman_os_ras_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -26,7 +26,7 @@ class FsAccessInterface;
 class SysFsAccessInterface;
 class RasUtil;
 
-class LinuxRasSources : NEO::NonCopyableOrMovableClass {
+class LinuxRasSources : NEO::NonCopyableAndNonMovableClass {
   public:
     virtual ze_result_t osRasGetState(zes_ras_state_t &state, ze_bool_t clear) = 0;
     virtual ze_result_t osRasGetStateExp(uint32_t numCategoriesRequested, zes_ras_state_exp_t *pState) = 0;
@@ -35,7 +35,7 @@ class LinuxRasSources : NEO::NonCopyableOrMovableClass {
     virtual ~LinuxRasSources() = default;
 };
 
-class LinuxRasImp : public OsRas, NEO::NonCopyableOrMovableClass {
+class LinuxRasImp : public OsRas, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t osRasGetProperties(zes_ras_properties_t &properties) override;
     ze_result_t osRasGetState(zes_ras_state_t &state, ze_bool_t clear) override;
diff --git a/level_zero/sysman/source/api/ras/sysman_ras_imp.h b/level_zero/sysman/source/api/ras/sysman_ras_imp.h
index 6dd8ade529..894e5ab5d0 100644
--- a/level_zero/sysman/source/api/ras/sysman_ras_imp.h
+++ b/level_zero/sysman/source/api/ras/sysman_ras_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 namespace L0 {
 namespace Sysman {
 
-class RasImp : public Ras, NEO::NonCopyableOrMovableClass {
+class RasImp : public Ras, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t rasGetProperties(zes_ras_properties_t *pProperties) override;
     ze_result_t rasGetConfig(zes_ras_config_t *pConfig) override;
diff --git a/level_zero/sysman/source/api/scheduler/linux/sysman_os_scheduler_imp.h b/level_zero/sysman/source/api/scheduler/linux/sysman_os_scheduler_imp.h
index ec09c1321d..de1234136d 100644
--- a/level_zero/sysman/source/api/scheduler/linux/sysman_os_scheduler_imp.h
+++ b/level_zero/sysman/source/api/scheduler/linux/sysman_os_scheduler_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,7 +21,7 @@ class SysFsAccessInterface;
 // zes_sched_timeslice_properties_t.interval = timeslice_duration_ms
 // zes_sched_timeslice_properties_t.yieldTimeout = preempt_timeout_ms
 // zes_sched_timeout_properties_t. watchdogTimeout =  heartbeat_interval_ms
-class LinuxSchedulerImp : public OsScheduler, NEO::NonCopyableOrMovableClass {
+class LinuxSchedulerImp : public OsScheduler, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t setExclusiveMode(ze_bool_t *pNeedReload) override;
     ze_result_t getCurrentMode(zes_sched_mode_t *pMode) override;
diff --git a/level_zero/sysman/source/api/scheduler/sysman_scheduler.h b/level_zero/sysman/source/api/scheduler/sysman_scheduler.h
index bcf1d09430..d1ea7ff35e 100644
--- a/level_zero/sysman/source/api/scheduler/sysman_scheduler.h
+++ b/level_zero/sysman/source/api/scheduler/sysman_scheduler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -37,7 +37,7 @@ class Scheduler : _zes_sched_handle_t {
     bool initSuccess = false;
 };
 
-struct SchedulerHandleContext : NEO::NonCopyableOrMovableClass {
+struct SchedulerHandleContext : NEO::NonCopyableAndNonMovableClass {
     SchedulerHandleContext(OsSysman *pOsSysman);
     ~SchedulerHandleContext();
     void init(uint32_t subDeviceCount);
diff --git a/level_zero/sysman/source/api/scheduler/sysman_scheduler_imp.h b/level_zero/sysman/source/api/scheduler/sysman_scheduler_imp.h
index 546b8278a8..86ecb81db1 100644
--- a/level_zero/sysman/source/api/scheduler/sysman_scheduler_imp.h
+++ b/level_zero/sysman/source/api/scheduler/sysman_scheduler_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 namespace L0 {
 namespace Sysman {
 
-class SchedulerImp : public Scheduler, NEO::NonCopyableOrMovableClass {
+class SchedulerImp : public Scheduler, NEO::NonCopyableAndNonMovableClass {
   public:
     void init();
     ze_result_t schedulerGetProperties(zes_sched_properties_t *pProperties) override;
diff --git a/level_zero/sysman/source/api/standby/linux/sysman_os_standby_imp.h b/level_zero/sysman/source/api/standby/linux/sysman_os_standby_imp.h
index 49b131e418..b182a6b93d 100644
--- a/level_zero/sysman/source/api/standby/linux/sysman_os_standby_imp.h
+++ b/level_zero/sysman/source/api/standby/linux/sysman_os_standby_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -18,7 +18,7 @@ namespace Sysman {
 class SysmanKmdInterface;
 class SysFsAccessInterface;
 class SysmanProductHelper;
-class LinuxStandbyImp : public OsStandby, NEO::NonCopyableOrMovableClass {
+class LinuxStandbyImp : public OsStandby, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getMode(zes_standby_promo_mode_t &mode) override;
     ze_result_t setMode(zes_standby_promo_mode_t mode) override;
diff --git a/level_zero/sysman/source/api/standby/sysman_standby_imp.h b/level_zero/sysman/source/api/standby/sysman_standby_imp.h
index e8b4d60cd8..ffec5b7259 100644
--- a/level_zero/sysman/source/api/standby/sysman_standby_imp.h
+++ b/level_zero/sysman/source/api/standby/sysman_standby_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 namespace L0 {
 namespace Sysman {
 
-class StandbyImp : public Standby, NEO::NonCopyableOrMovableClass {
+class StandbyImp : public Standby, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t standbyGetProperties(zes_standby_properties_t *pProperties) override;
     ze_result_t standbyGetMode(zes_standby_promo_mode_t *pMode) override;
diff --git a/level_zero/sysman/source/api/temperature/linux/sysman_os_temperature_imp.h b/level_zero/sysman/source/api/temperature/linux/sysman_os_temperature_imp.h
index cc322eb5b8..a0c4f3b7c9 100644
--- a/level_zero/sysman/source/api/temperature/linux/sysman_os_temperature_imp.h
+++ b/level_zero/sysman/source/api/temperature/linux/sysman_os_temperature_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,7 +19,7 @@ namespace Sysman {
 
 class LinuxSysmanImp;
 class SysmanProductHelper;
-class LinuxTemperatureImp : public OsTemperature, NEO::NonCopyableOrMovableClass {
+class LinuxTemperatureImp : public OsTemperature, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_temp_properties_t *pProperties) override;
     ze_result_t getSensorTemperature(double *pTemperature) override;
diff --git a/level_zero/sysman/source/api/temperature/sysman_temperature_imp.h b/level_zero/sysman/source/api/temperature/sysman_temperature_imp.h
index 4f684e5e15..e254b737c6 100644
--- a/level_zero/sysman/source/api/temperature/sysman_temperature_imp.h
+++ b/level_zero/sysman/source/api/temperature/sysman_temperature_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 
 namespace L0 {
 namespace Sysman {
-class TemperatureImp : public Temperature, NEO::NonCopyableOrMovableClass {
+class TemperatureImp : public Temperature, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t temperatureGetProperties(zes_temp_properties_t *pProperties) override;
     ze_result_t temperatureGetConfig(zes_temp_config_t *pConfig) override;
diff --git a/level_zero/sysman/source/api/temperature/windows/sysman_os_temperature_imp.h b/level_zero/sysman/source/api/temperature/windows/sysman_os_temperature_imp.h
index 956f01cd79..50acc6033c 100644
--- a/level_zero/sysman/source/api/temperature/windows/sysman_os_temperature_imp.h
+++ b/level_zero/sysman/source/api/temperature/windows/sysman_os_temperature_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 namespace L0 {
 namespace Sysman {
 class KmdSysManager;
-class WddmTemperatureImp : public OsTemperature, NEO::NonCopyableOrMovableClass {
+class WddmTemperatureImp : public OsTemperature, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_temp_properties_t *pProperties) override;
     ze_result_t getSensorTemperature(double *pTemperature) override;
diff --git a/level_zero/sysman/source/api/vf_management/linux/sysman_os_vf_imp.h b/level_zero/sysman/source/api/vf_management/linux/sysman_os_vf_imp.h
index fde7ab1281..4673efa577 100644
--- a/level_zero/sysman/source/api/vf_management/linux/sysman_os_vf_imp.h
+++ b/level_zero/sysman/source/api/vf_management/linux/sysman_os_vf_imp.h
@@ -20,7 +20,7 @@ namespace L0 {
 namespace Sysman {
 class SysFsAccessInterface;
 
-class LinuxVfImp : public OsVf, NEO::NonCopyableOrMovableClass {
+class LinuxVfImp : public OsVf, NEO::NonCopyableAndNonMovableClass {
   public:
     struct EngineUtilsData {
         zes_engine_group_t engineType{};
diff --git a/level_zero/sysman/source/api/vf_management/sysman_vf_imp.h b/level_zero/sysman/source/api/vf_management/sysman_vf_imp.h
index 8970d32d9a..c93724769e 100644
--- a/level_zero/sysman/source/api/vf_management/sysman_vf_imp.h
+++ b/level_zero/sysman/source/api/vf_management/sysman_vf_imp.h
@@ -17,7 +17,7 @@
 namespace L0 {
 namespace Sysman {
 
-class VfImp : public VfManagement, NEO::NonCopyableOrMovableClass {
+class VfImp : public VfManagement, NEO::NonCopyableAndNonMovableClass {
   public:
     void init();
     ze_result_t vfGetCapabilities(zes_vf_exp2_capabilities_t *pCapability) override;
diff --git a/level_zero/sysman/source/device/sysman_device_imp.h b/level_zero/sysman/source/device/sysman_device_imp.h
index 5a73d63edd..d796cf9ab8 100644
--- a/level_zero/sysman/source/device/sysman_device_imp.h
+++ b/level_zero/sysman/source/device/sysman_device_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,7 +19,7 @@ namespace L0 {
 namespace Sysman {
 struct OsSysman;
 
-struct SysmanDeviceImp : SysmanDevice, NEO::NonCopyableOrMovableClass {
+struct SysmanDeviceImp : SysmanDevice, NEO::NonCopyableAndNonMovableClass {
 
     SysmanDeviceImp(NEO::ExecutionEnvironment *executionEnvironment, const uint32_t rootDeviceIndex);
     ~SysmanDeviceImp() override;
diff --git a/level_zero/sysman/source/shared/firmware_util/sysman_firmware_util_imp.h b/level_zero/sysman/source/shared/firmware_util/sysman_firmware_util_imp.h
index aed5c1fac5..8355894ff1 100644
--- a/level_zero/sysman/source/shared/firmware_util/sysman_firmware_util_imp.h
+++ b/level_zero/sysman/source/shared/firmware_util/sysman_firmware_util_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -110,7 +110,7 @@ typedef struct {
     std::mutex fwProgressLock;
 } FlashProgressInfo;
 
-class FirmwareUtilImp : public FirmwareUtil, NEO::NonCopyableOrMovableClass {
+class FirmwareUtilImp : public FirmwareUtil, NEO::NonCopyableAndNonMovableClass {
   public:
     FirmwareUtilImp(uint16_t domain, uint8_t bus, uint8_t device, uint8_t function);
     ~FirmwareUtilImp() override;
diff --git a/level_zero/sysman/source/shared/linux/nl_api/sysman_nl_api.h b/level_zero/sysman/source/shared/linux/nl_api/sysman_nl_api.h
index 82db277606..9ceb7a3cae 100644
--- a/level_zero/sysman/source/shared/linux/nl_api/sysman_nl_api.h
+++ b/level_zero/sysman/source/shared/linux/nl_api/sysman_nl_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -58,7 +58,7 @@ typedef struct nlmsghdr *(*pNlmsgHdr)(struct nl_msg *);
 typedef struct nlattr *(*pNlaNestStart)(struct nl_msg *, int);
 typedef int (*pNlaNestEnd)(struct nl_msg *, struct nlattr *);
 
-class NlApi : public NEO::NonCopyableOrMovableClass {
+class NlApi : public NEO::NonCopyableAndNonMovableClass {
   public:
     MOCKABLE_VIRTUAL int genlConnect(struct nl_sock *sock);
     MOCKABLE_VIRTUAL int genlCtrlResolve(struct nl_sock *sock, const char *name);
diff --git a/level_zero/sysman/source/shared/linux/pmt/sysman_pmt.h b/level_zero/sysman/source/shared/linux/pmt/sysman_pmt.h
index 08ec0c42fb..abcb29b3bc 100644
--- a/level_zero/sysman/source/shared/linux/pmt/sysman_pmt.h
+++ b/level_zero/sysman/source/shared/linux/pmt/sysman_pmt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,7 +19,7 @@ class LinuxSysmanImp;
 class FsAccessInterface;
 class SysmanProductHelper;
 
-class PlatformMonitoringTech : NEO::NonCopyableOrMovableClass {
+class PlatformMonitoringTech : NEO::NonCopyableAndNonMovableClass {
   public:
     struct TelemData {
         std::string telemDir;
diff --git a/level_zero/sysman/source/shared/linux/pmu/sysman_pmu_imp.h b/level_zero/sysman/source/shared/linux/pmu/sysman_pmu_imp.h
index 3a6eff2cda..40932082eb 100644
--- a/level_zero/sysman/source/shared/linux/pmu/sysman_pmu_imp.h
+++ b/level_zero/sysman/source/shared/linux/pmu/sysman_pmu_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,7 +19,7 @@ namespace Sysman {
 
 class SysmanKmdInterface;
 
-class PmuInterfaceImp : public PmuInterface, NEO::NonCopyableOrMovableClass {
+class PmuInterfaceImp : public PmuInterface, NEO::NonCopyableAndNonMovableClass {
   public:
     PmuInterfaceImp() = delete;
     PmuInterfaceImp(LinuxSysmanImp *pLinuxSysmanImp);
diff --git a/level_zero/sysman/source/shared/linux/zes_os_sysman_driver_imp.h b/level_zero/sysman/source/shared/linux/zes_os_sysman_driver_imp.h
index 6069e3f66f..7688dd042e 100644
--- a/level_zero/sysman/source/shared/linux/zes_os_sysman_driver_imp.h
+++ b/level_zero/sysman/source/shared/linux/zes_os_sysman_driver_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,7 @@ namespace Sysman {
 class LinuxEventsUtil;
 struct SysmanDeviceImp;
 
-class LinuxSysmanDriverImp : public OsSysmanDriver, NEO::NonCopyableOrMovableClass {
+class LinuxSysmanDriverImp : public OsSysmanDriver, NEO::NonCopyableAndNonMovableClass {
   public:
     LinuxSysmanDriverImp();
     ~LinuxSysmanDriverImp() override;
diff --git a/level_zero/sysman/source/shared/linux/zes_os_sysman_imp.h b/level_zero/sysman/source/shared/linux/zes_os_sysman_imp.h
index 38e388c712..88c98dc398 100644
--- a/level_zero/sysman/source/shared/linux/zes_os_sysman_imp.h
+++ b/level_zero/sysman/source/shared/linux/zes_os_sysman_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -35,7 +35,7 @@ class FsAccessInterface;
 class SysFsAccessInterface;
 class ProcFsAccessInterface;
 
-class LinuxSysmanImp : public OsSysman, NEO::NonCopyableOrMovableClass {
+class LinuxSysmanImp : public OsSysman, NEO::NonCopyableAndNonMovableClass {
   public:
     LinuxSysmanImp(SysmanDeviceImp *pParentSysmanDeviceImp);
     ~LinuxSysmanImp() override;
diff --git a/level_zero/sysman/source/shared/windows/pmt/sysman_pmt.h b/level_zero/sysman/source/shared/windows/pmt/sysman_pmt.h
index b7f6debeb7..ba48185264 100644
--- a/level_zero/sysman/source/shared/windows/pmt/sysman_pmt.h
+++ b/level_zero/sysman/source/shared/windows/pmt/sysman_pmt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2024 Intel Corporation
+ * Copyright (C) 2024-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -23,7 +23,7 @@ namespace L0 {
 namespace Sysman {
 
 class SysmanProductHelper;
-class PlatformMonitoringTech : NEO::NonCopyableOrMovableClass {
+class PlatformMonitoringTech : NEO::NonCopyableAndNonMovableClass {
   public:
     PlatformMonitoringTech() = delete;
     PlatformMonitoringTech(std::vector<wchar_t> deviceInterface, SysmanProductHelper *pSysmanProductHelper) : deviceInterface(std::move(deviceInterface)), pSysmanProductHelper(pSysmanProductHelper) {}
diff --git a/level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h b/level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h
index 17e09b9b80..bac570ac30 100644
--- a/level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h
+++ b/level_zero/sysman/source/shared/windows/zes_os_sysman_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023-2024 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -23,7 +23,7 @@ namespace Sysman {
 class SysmanProductHelper;
 class PlatformMonitoringTech;
 
-class WddmSysmanImp : public OsSysman, NEO::NonCopyableOrMovableClass {
+class WddmSysmanImp : public OsSysman, NEO::NonCopyableAndNonMovableClass {
   public:
     WddmSysmanImp(SysmanDeviceImp *pParentSysmanDeviceImp);
     ~WddmSysmanImp() override;
diff --git a/level_zero/tools/source/sysman/diagnostics/diagnostics_imp.h b/level_zero/tools/source/sysman/diagnostics/diagnostics_imp.h
index 74c4a77bde..2ba34de63a 100644
--- a/level_zero/tools/source/sysman/diagnostics/diagnostics_imp.h
+++ b/level_zero/tools/source/sysman/diagnostics/diagnostics_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,7 @@ namespace L0 {
 
 class OsDiagnostics;
 
-class DiagnosticsImp : public Diagnostics, NEO::NonCopyableOrMovableClass {
+class DiagnosticsImp : public Diagnostics, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t diagnosticsGetProperties(zes_diag_properties_t *pProperties) override;
     ze_result_t diagnosticsGetTests(uint32_t *pCount, zes_diag_test_t *pTests) override;
diff --git a/level_zero/tools/source/sysman/diagnostics/linux/os_diagnostics_imp.h b/level_zero/tools/source/sysman/diagnostics/linux/os_diagnostics_imp.h
index 7e54185a2c..75db993e09 100644
--- a/level_zero/tools/source/sysman/diagnostics/linux/os_diagnostics_imp.h
+++ b/level_zero/tools/source/sysman/diagnostics/linux/os_diagnostics_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 namespace L0 {
 class FirmwareUtil;
 
-class LinuxDiagnosticsImp : public OsDiagnostics, NEO::NonCopyableOrMovableClass {
+class LinuxDiagnosticsImp : public OsDiagnostics, NEO::NonCopyableAndNonMovableClass {
   public:
     void osGetDiagProperties(zes_diag_properties_t *pProperties) override;
     ze_result_t osGetDiagTests(uint32_t *pCount, zes_diag_test_t *pTests) override;
diff --git a/level_zero/tools/source/sysman/ecc/ecc_imp.h b/level_zero/tools/source/sysman/ecc/ecc_imp.h
index fd80385e4d..176e12e0ee 100644
--- a/level_zero/tools/source/sysman/ecc/ecc_imp.h
+++ b/level_zero/tools/source/sysman/ecc/ecc_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,7 +13,7 @@
 namespace L0 {
 class FirmwareUtil;
 struct OsSysman;
-class EccImp : public Ecc, NEO::NonCopyableOrMovableClass {
+class EccImp : public Ecc, NEO::NonCopyableAndNonMovableClass {
   public:
     void init() override {}
     ze_result_t deviceEccAvailable(ze_bool_t *pAvailable) override;
diff --git a/level_zero/tools/source/sysman/engine/engine_imp.h b/level_zero/tools/source/sysman/engine/engine_imp.h
index ef214a9bf8..3a2c3ab7a3 100644
--- a/level_zero/tools/source/sysman/engine/engine_imp.h
+++ b/level_zero/tools/source/sysman/engine/engine_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 #include <level_zero/zes_api.h>
 namespace L0 {
 
-class EngineImp : public Engine, NEO::NonCopyableOrMovableClass {
+class EngineImp : public Engine, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t engineGetProperties(zes_engine_properties_t *pProperties) override;
     ze_result_t engineGetActivity(zes_engine_stats_t *pStats) override;
diff --git a/level_zero/tools/source/sysman/engine/linux/os_engine_imp.h b/level_zero/tools/source/sysman/engine/linux/os_engine_imp.h
index 2adf1e4140..b56a2a091c 100644
--- a/level_zero/tools/source/sysman/engine/linux/os_engine_imp.h
+++ b/level_zero/tools/source/sysman/engine/linux/os_engine_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -18,7 +18,7 @@
 namespace L0 {
 class PmuInterface;
 struct Device;
-class LinuxEngineImp : public OsEngine, NEO::NonCopyableOrMovableClass {
+class LinuxEngineImp : public OsEngine, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getActivity(zes_engine_stats_t *pStats) override;
     ze_result_t getActivityExt(uint32_t *pCount, zes_engine_stats_t *pStats) override;
@@ -50,7 +50,7 @@ class LinuxEngineImp : public OsEngine, NEO::NonCopyableOrMovableClass {
     ze_result_t initStatus = ZE_RESULT_SUCCESS;
 };
 
-class LinuxEngineImpPrelim : public OsEngine, NEO::NonCopyableOrMovableClass {
+class LinuxEngineImpPrelim : public OsEngine, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getActivity(zes_engine_stats_t *pStats) override;
     ze_result_t getActivityExt(uint32_t *pCount, zes_engine_stats_t *pStats) override;
diff --git a/level_zero/tools/source/sysman/engine/windows/os_engine_imp.h b/level_zero/tools/source/sysman/engine/windows/os_engine_imp.h
index b09d1faeeb..b374116f03 100644
--- a/level_zero/tools/source/sysman/engine/windows/os_engine_imp.h
+++ b/level_zero/tools/source/sysman/engine/windows/os_engine_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,7 +13,7 @@
 
 namespace L0 {
 class KmdSysManager;
-class WddmEngineImp : public OsEngine, NEO::NonCopyableOrMovableClass {
+class WddmEngineImp : public OsEngine, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getActivity(zes_engine_stats_t *pStats) override;
     ze_result_t getActivityExt(uint32_t *pCount, zes_engine_stats_t *pStats) override;
diff --git a/level_zero/tools/source/sysman/events/events_imp.h b/level_zero/tools/source/sysman/events/events_imp.h
index 5bbeaf169a..3587733a09 100644
--- a/level_zero/tools/source/sysman/events/events_imp.h
+++ b/level_zero/tools/source/sysman/events/events_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 
 namespace L0 {
 
-class EventsImp : public Events, NEO::NonCopyableOrMovableClass {
+class EventsImp : public Events, NEO::NonCopyableAndNonMovableClass {
   public:
     void init() override;
     ze_result_t eventRegister(zes_event_type_flags_t events) override;
diff --git a/level_zero/tools/source/sysman/events/linux/os_events_imp.h b/level_zero/tools/source/sysman/events/linux/os_events_imp.h
index 148905f167..29ffcf2c80 100644
--- a/level_zero/tools/source/sysman/events/linux/os_events_imp.h
+++ b/level_zero/tools/source/sysman/events/linux/os_events_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,7 +12,7 @@
 
 namespace L0 {
 
-class LinuxEventsImp : public OsEvents, NEO::NonCopyableOrMovableClass {
+class LinuxEventsImp : public OsEvents, NEO::NonCopyableAndNonMovableClass {
   public:
     bool eventListen(zes_event_type_flags_t &pEvent, uint64_t timeout) override;
     ze_result_t eventRegister(zes_event_type_flags_t events) override;
diff --git a/level_zero/tools/source/sysman/events/windows/os_events_imp.h b/level_zero/tools/source/sysman/events/windows/os_events_imp.h
index 2cf2a44d69..3b6bec7958 100644
--- a/level_zero/tools/source/sysman/events/windows/os_events_imp.h
+++ b/level_zero/tools/source/sysman/events/windows/os_events_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,7 +21,7 @@ struct EventHandler {
     uint32_t requestId;
 };
 
-class WddmEventsImp : public OsEvents, NEO::NonCopyableOrMovableClass {
+class WddmEventsImp : public OsEvents, NEO::NonCopyableAndNonMovableClass {
   public:
     bool eventListen(zes_event_type_flags_t &pEvent, uint64_t timeout) override;
     ze_result_t eventRegister(zes_event_type_flags_t events) override;
diff --git a/level_zero/tools/source/sysman/fabric_port/fabric_port.h b/level_zero/tools/source/sysman/fabric_port/fabric_port.h
index 0880bf48b6..1aadf716ff 100644
--- a/level_zero/tools/source/sysman/fabric_port/fabric_port.h
+++ b/level_zero/tools/source/sysman/fabric_port/fabric_port.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -45,7 +45,7 @@ class FabricPort : _zes_fabric_port_handle_t {
     }
 };
 
-struct FabricPortHandleContext : NEO::NonCopyableOrMovableClass {
+struct FabricPortHandleContext : NEO::NonCopyableAndNonMovableClass {
     FabricPortHandleContext(OsSysman *pOsSysman);
     ~FabricPortHandleContext();
 
diff --git a/level_zero/tools/source/sysman/fabric_port/fabric_port_imp.h b/level_zero/tools/source/sysman/fabric_port/fabric_port_imp.h
index 4f7a4f4a5d..a3e046058e 100644
--- a/level_zero/tools/source/sysman/fabric_port/fabric_port_imp.h
+++ b/level_zero/tools/source/sysman/fabric_port/fabric_port_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 
 namespace L0 {
 
-class FabricDeviceImp : public FabricDevice, NEO::NonCopyableOrMovableClass {
+class FabricDeviceImp : public FabricDevice, NEO::NonCopyableAndNonMovableClass {
   public:
     FabricDeviceImp() = delete;
     FabricDeviceImp(OsSysman *pOsSysman);
@@ -27,7 +27,7 @@ class FabricDeviceImp : public FabricDevice, NEO::NonCopyableOrMovableClass {
     OsFabricDevice *pOsFabricDevice = nullptr;
 };
 
-class FabricPortImp : public FabricPort, NEO::NonCopyableOrMovableClass {
+class FabricPortImp : public FabricPort, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t fabricPortGetProperties(zes_fabric_port_properties_t *pProperties) override;
     ze_result_t fabricPortGetLinkType(zes_fabric_link_type_t *pLinkType) override;
diff --git a/level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access.h b/level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access.h
index 72fe4e20ec..4cca510491 100644
--- a/level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access.h
+++ b/level_zero/tools/source/sysman/fabric_port/linux/fabric_device_access.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,7 @@ namespace L0 {
 
 struct OsSysman;
 
-class FabricDeviceAccess : NEO::NonCopyableOrMovableClass {
+class FabricDeviceAccess : NEO::NonCopyableAndNonMovableClass {
   public:
     virtual ze_result_t getState(const zes_fabric_port_id_t portId, zes_fabric_port_state_t &state) = 0;
     virtual ze_result_t getThroughput(const zes_fabric_port_id_t portId, zes_fabric_port_throughput_t &througput) = 0;
diff --git a/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp.h b/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp.h
index 75f82a4064..cfb03bbb11 100644
--- a/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp.h
+++ b/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 
 namespace L0 {
 
-class LinuxFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableOrMovableClass {
+class LinuxFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableAndNonMovableClass {
   public:
     uint32_t getNumPorts() override;
     ze_result_t getMultiPortThroughput(std::vector<zes_fabric_port_id_t> &portIdList, zes_fabric_port_throughput_t **pThroughput) override;
@@ -27,7 +27,7 @@ class LinuxFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableOrMovableCla
     uint32_t numPorts = 0;
 };
 
-class LinuxFabricPortImp : public OsFabricPort, NEO::NonCopyableOrMovableClass {
+class LinuxFabricPortImp : public OsFabricPort, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_fabric_port_properties_t *pProperties) override;
     ze_result_t getLinkType(zes_fabric_link_type_t *pLinkType) override;
diff --git a/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp_prelim.h b/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp_prelim.h
index b7ffa4dddc..4e796b2ee0 100644
--- a/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp_prelim.h
+++ b/level_zero/tools/source/sysman/fabric_port/linux/os_fabric_port_imp_prelim.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,7 @@
 
 namespace L0 {
 class LinuxSysmanImp;
-class LinuxFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableOrMovableClass {
+class LinuxFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableAndNonMovableClass {
   public:
     uint32_t getNumPorts() override;
     ze_result_t getMultiPortThroughput(std::vector<zes_fabric_port_id_t> &portIdList, zes_fabric_port_throughput_t **pThroughput) override;
@@ -59,7 +59,7 @@ class LinuxFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableOrMovableCla
     FabricDeviceAccess *pFabricDeviceAccess = nullptr;
 };
 
-class LinuxFabricPortImp : public OsFabricPort, NEO::NonCopyableOrMovableClass {
+class LinuxFabricPortImp : public OsFabricPort, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_fabric_port_properties_t *pProperties) override;
     ze_result_t getLinkType(zes_fabric_link_type_t *pLinkType) override;
diff --git a/level_zero/tools/source/sysman/fabric_port/windows/os_fabric_port_imp.h b/level_zero/tools/source/sysman/fabric_port/windows/os_fabric_port_imp.h
index 9eaba75562..219d404358 100644
--- a/level_zero/tools/source/sysman/fabric_port/windows/os_fabric_port_imp.h
+++ b/level_zero/tools/source/sysman/fabric_port/windows/os_fabric_port_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,7 +13,7 @@
 
 namespace L0 {
 
-class WddmFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableOrMovableClass {
+class WddmFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableAndNonMovableClass {
   public:
     uint32_t getNumPorts() override;
     ze_result_t getMultiPortThroughput(std::vector<zes_fabric_port_id_t> &portIdList, zes_fabric_port_throughput_t **pThroughput) override;
@@ -26,7 +26,7 @@ class WddmFabricDeviceImp : public OsFabricDevice, NEO::NonCopyableOrMovableClas
     uint32_t numPorts = 0;
 };
 
-class WddmFabricPortImp : public OsFabricPort, NEO::NonCopyableOrMovableClass {
+class WddmFabricPortImp : public OsFabricPort, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_fabric_port_properties_t *pProperties) override;
     ze_result_t getLinkType(zes_fabric_link_type_t *pLinkType) override;
diff --git a/level_zero/tools/source/sysman/fan/fan_imp.h b/level_zero/tools/source/sysman/fan/fan_imp.h
index a73bc439cb..11c43037eb 100644
--- a/level_zero/tools/source/sysman/fan/fan_imp.h
+++ b/level_zero/tools/source/sysman/fan/fan_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,7 +13,7 @@
 #include "level_zero/tools/source/sysman/fan/os_fan.h"
 
 namespace L0 {
-class FanImp : public Fan, NEO::NonCopyableOrMovableClass {
+class FanImp : public Fan, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t fanGetProperties(zes_fan_properties_t *pProperties) override;
     ze_result_t fanGetConfig(zes_fan_config_t *pConfig) override;
diff --git a/level_zero/tools/source/sysman/fan/linux/os_fan_imp.h b/level_zero/tools/source/sysman/fan/linux/os_fan_imp.h
index 3de74baaf4..099a0aef0b 100644
--- a/level_zero/tools/source/sysman/fan/linux/os_fan_imp.h
+++ b/level_zero/tools/source/sysman/fan/linux/os_fan_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@ namespace L0 {
 
 class SysfsAccess;
 
-class LinuxFanImp : public OsFan, NEO::NonCopyableOrMovableClass {
+class LinuxFanImp : public OsFan, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_fan_properties_t *pProperties) override;
     ze_result_t getConfig(zes_fan_config_t *pConfig) override;
diff --git a/level_zero/tools/source/sysman/fan/windows/os_fan_imp.h b/level_zero/tools/source/sysman/fan/windows/os_fan_imp.h
index 8340c9040b..c14796e285 100644
--- a/level_zero/tools/source/sysman/fan/windows/os_fan_imp.h
+++ b/level_zero/tools/source/sysman/fan/windows/os_fan_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 namespace L0 {
 
 class KmdSysManager;
-class WddmFanImp : public OsFan, NEO::NonCopyableOrMovableClass {
+class WddmFanImp : public OsFan, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_fan_properties_t *pProperties) override;
     ze_result_t getConfig(zes_fan_config_t *pConfig) override;
diff --git a/level_zero/tools/source/sysman/firmware/firmware_imp.h b/level_zero/tools/source/sysman/firmware/firmware_imp.h
index 4459d583e1..29a533d313 100644
--- a/level_zero/tools/source/sysman/firmware/firmware_imp.h
+++ b/level_zero/tools/source/sysman/firmware/firmware_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,7 @@ namespace L0 {
 
 class OsFirmware;
 
-class FirmwareImp : public Firmware, NEO::NonCopyableOrMovableClass {
+class FirmwareImp : public Firmware, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t firmwareGetProperties(zes_firmware_properties_t *pProperties) override;
     ze_result_t firmwareFlash(void *pImage, uint32_t size) override;
diff --git a/level_zero/tools/source/sysman/firmware/linux/os_firmware_imp.h b/level_zero/tools/source/sysman/firmware/linux/os_firmware_imp.h
index b2733a267b..63e08b0f62 100644
--- a/level_zero/tools/source/sysman/firmware/linux/os_firmware_imp.h
+++ b/level_zero/tools/source/sysman/firmware/linux/os_firmware_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 namespace L0 {
 class FirmwareUtil;
 
-class LinuxFirmwareImp : public OsFirmware, NEO::NonCopyableOrMovableClass {
+class LinuxFirmwareImp : public OsFirmware, NEO::NonCopyableAndNonMovableClass {
   public:
     void osGetFwProperties(zes_firmware_properties_t *pProperties) override;
     ze_result_t osFirmwareFlash(void *pImage, uint32_t size) override;
diff --git a/level_zero/tools/source/sysman/firmware_util/firmware_util_imp.h b/level_zero/tools/source/sysman/firmware_util/firmware_util_imp.h
index 65dd52eab0..ecc238d53a 100644
--- a/level_zero/tools/source/sysman/firmware_util/firmware_util_imp.h
+++ b/level_zero/tools/source/sysman/firmware_util/firmware_util_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2024 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -102,7 +102,7 @@ extern pIgscIfrRunMemPPRTest deviceIfrRunMemPPRTest;
 extern pIgscGetEccConfig getEccConfig;
 extern pIgscSetEccConfig setEccConfig;
 
-class FirmwareUtilImp : public FirmwareUtil, NEO::NonCopyableOrMovableClass {
+class FirmwareUtilImp : public FirmwareUtil, NEO::NonCopyableAndNonMovableClass {
   public:
     FirmwareUtilImp(uint16_t domain, uint8_t bus, uint8_t device, uint8_t function);
     ~FirmwareUtilImp() override;
diff --git a/level_zero/tools/source/sysman/frequency/frequency_imp.h b/level_zero/tools/source/sysman/frequency/frequency_imp.h
index 624422bcd1..442acf36f6 100644
--- a/level_zero/tools/source/sysman/frequency/frequency_imp.h
+++ b/level_zero/tools/source/sysman/frequency/frequency_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 
 namespace L0 {
 
-class FrequencyImp : public Frequency, NEO::NonCopyableOrMovableClass {
+class FrequencyImp : public Frequency, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t frequencyGetProperties(zes_freq_properties_t *pProperties) override;
     ze_result_t frequencyGetAvailableClocks(uint32_t *pCount, double *phFrequency) override;
diff --git a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.h b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.h
index 5f129b75d5..6092a49bbe 100644
--- a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.h
+++ b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 
 namespace L0 {
 
-class LinuxFrequencyImp : public OsFrequency, NEO::NonCopyableOrMovableClass {
+class LinuxFrequencyImp : public OsFrequency, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t osFrequencyGetProperties(zes_freq_properties_t &properties) override;
     double osFrequencyGetStepSize() override;
diff --git a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.h b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.h
index 8e18792627..714e38ad23 100644
--- a/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.h
+++ b/level_zero/tools/source/sysman/frequency/linux/os_frequency_imp_prelim.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 
 namespace L0 {
 
-class LinuxFrequencyImp : public OsFrequency, NEO::NonCopyableOrMovableClass {
+class LinuxFrequencyImp : public OsFrequency, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t osFrequencyGetProperties(zes_freq_properties_t &properties) override;
     double osFrequencyGetStepSize() override;
diff --git a/level_zero/tools/source/sysman/frequency/windows/os_frequency_imp.h b/level_zero/tools/source/sysman/frequency/windows/os_frequency_imp.h
index f868464e9a..171d5a1a86 100644
--- a/level_zero/tools/source/sysman/frequency/windows/os_frequency_imp.h
+++ b/level_zero/tools/source/sysman/frequency/windows/os_frequency_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -39,7 +39,7 @@ struct KmdThrottleReasons {
 };
 
 class KmdSysManager;
-class WddmFrequencyImp : public OsFrequency, NEO::NonCopyableOrMovableClass {
+class WddmFrequencyImp : public OsFrequency, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t osFrequencyGetProperties(zes_freq_properties_t &properties) override;
     double osFrequencyGetStepSize() override;
diff --git a/level_zero/tools/source/sysman/global_operations/global_operations_imp.h b/level_zero/tools/source/sysman/global_operations/global_operations_imp.h
index f3ac8e73e7..f357628695 100644
--- a/level_zero/tools/source/sysman/global_operations/global_operations_imp.h
+++ b/level_zero/tools/source/sysman/global_operations/global_operations_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 
 namespace L0 {
 
-class GlobalOperationsImp : public GlobalOperations, NEO::NonCopyableOrMovableClass {
+class GlobalOperationsImp : public GlobalOperations, NEO::NonCopyableAndNonMovableClass {
   public:
     void init() override;
     ze_result_t reset(ze_bool_t force) override;
diff --git a/level_zero/tools/source/sysman/global_operations/linux/os_global_operations_imp.h b/level_zero/tools/source/sysman/global_operations/linux/os_global_operations_imp.h
index 5e4a1298ce..6b9693df39 100644
--- a/level_zero/tools/source/sysman/global_operations/linux/os_global_operations_imp.h
+++ b/level_zero/tools/source/sysman/global_operations/linux/os_global_operations_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@ namespace L0 {
 class SysfsAccess;
 struct Device;
 
-class LinuxGlobalOperationsImp : public OsGlobalOperations, NEO::NonCopyableOrMovableClass {
+class LinuxGlobalOperationsImp : public OsGlobalOperations, NEO::NonCopyableAndNonMovableClass {
   public:
     bool getSerialNumber(char (&serialNumber)[ZES_STRING_PROPERTY_SIZE]) override;
     bool getBoardNumber(char (&boardNumber)[ZES_STRING_PROPERTY_SIZE]) override;
diff --git a/level_zero/tools/source/sysman/global_operations/windows/os_global_operations_imp.h b/level_zero/tools/source/sysman/global_operations/windows/os_global_operations_imp.h
index d7c1a81c47..c140a8cbe7 100644
--- a/level_zero/tools/source/sysman/global_operations/windows/os_global_operations_imp.h
+++ b/level_zero/tools/source/sysman/global_operations/windows/os_global_operations_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 namespace L0 {
 
 class KmdSysManager;
-class WddmGlobalOperationsImp : public OsGlobalOperations, NEO::NonCopyableOrMovableClass {
+class WddmGlobalOperationsImp : public OsGlobalOperations, NEO::NonCopyableAndNonMovableClass {
   public:
     bool getSerialNumber(char (&serialNumber)[ZES_STRING_PROPERTY_SIZE]) override;
     bool getBoardNumber(char (&boardNumber)[ZES_STRING_PROPERTY_SIZE]) override;
diff --git a/level_zero/tools/source/sysman/linux/nl_api/nl_api.h b/level_zero/tools/source/sysman/linux/nl_api/nl_api.h
index 214cef57cf..0fd8076833 100644
--- a/level_zero/tools/source/sysman/linux/nl_api/nl_api.h
+++ b/level_zero/tools/source/sysman/linux/nl_api/nl_api.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -59,7 +59,7 @@ typedef struct nlmsghdr *(*pNlmsgHdr)(struct nl_msg *);
 typedef struct nlattr *(*pNlaNestStart)(struct nl_msg *, int);
 typedef int (*pNlaNestEnd)(struct nl_msg *, struct nlattr *);
 
-class NlApi : public NEO::NonCopyableOrMovableClass {
+class NlApi : public NEO::NonCopyableAndNonMovableClass {
   public:
     MOCKABLE_VIRTUAL int genlConnect(struct nl_sock *sock);
     MOCKABLE_VIRTUAL int genlCtrlResolve(struct nl_sock *sock, const char *name);
diff --git a/level_zero/tools/source/sysman/linux/os_sysman_driver_imp.h b/level_zero/tools/source/sysman/linux/os_sysman_driver_imp.h
index fdf55040ea..64b6a5af05 100644
--- a/level_zero/tools/source/sysman/linux/os_sysman_driver_imp.h
+++ b/level_zero/tools/source/sysman/linux/os_sysman_driver_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -16,7 +16,7 @@ namespace L0 {
 class LinuxEventsUtil;
 struct SysmanDeviceImp;
 
-class LinuxSysmanDriverImp : public OsSysmanDriver, NEO::NonCopyableOrMovableClass {
+class LinuxSysmanDriverImp : public OsSysmanDriver, NEO::NonCopyableAndNonMovableClass {
   public:
     LinuxSysmanDriverImp();
     ~LinuxSysmanDriverImp() override;
diff --git a/level_zero/tools/source/sysman/linux/os_sysman_imp.h b/level_zero/tools/source/sysman/linux/os_sysman_imp.h
index 3be542602b..60b2034858 100644
--- a/level_zero/tools/source/sysman/linux/os_sysman_imp.h
+++ b/level_zero/tools/source/sysman/linux/os_sysman_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -40,7 +40,7 @@ class ExecutionEnvironmentRefCountRestore {
     NEO::ExecutionEnvironment *executionEnvironment = nullptr;
 };
 
-class LinuxSysmanImp : public OsSysman, NEO::NonCopyableOrMovableClass {
+class LinuxSysmanImp : public OsSysman, NEO::NonCopyableAndNonMovableClass {
   public:
     LinuxSysmanImp(SysmanDeviceImp *pParentSysmanDeviceImp);
     ~LinuxSysmanImp() override;
diff --git a/level_zero/tools/source/sysman/linux/pmt/pmt.h b/level_zero/tools/source/sysman/linux/pmt/pmt.h
index 16d87779ee..c76297053e 100644
--- a/level_zero/tools/source/sysman/linux/pmt/pmt.h
+++ b/level_zero/tools/source/sysman/linux/pmt/pmt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,7 +19,7 @@
 
 namespace L0 {
 
-class PlatformMonitoringTech : NEO::NonCopyableOrMovableClass {
+class PlatformMonitoringTech : NEO::NonCopyableAndNonMovableClass {
   public:
     PlatformMonitoringTech() = delete;
     PlatformMonitoringTech(FsAccess *pFsAccess, ze_bool_t onSubdevice, uint32_t subdeviceId);
diff --git a/level_zero/tools/source/sysman/linux/pmu/pmu_imp.h b/level_zero/tools/source/sysman/linux/pmu/pmu_imp.h
index 3f38a2d4a2..707ea8eda7 100644
--- a/level_zero/tools/source/sysman/linux/pmu/pmu_imp.h
+++ b/level_zero/tools/source/sysman/linux/pmu/pmu_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 
 namespace L0 {
 
-class PmuInterfaceImp : public PmuInterface, NEO::NonCopyableOrMovableClass {
+class PmuInterfaceImp : public PmuInterface, NEO::NonCopyableAndNonMovableClass {
   public:
     PmuInterfaceImp() = delete;
     PmuInterfaceImp(LinuxSysmanImp *pLinuxSysmanImp);
diff --git a/level_zero/tools/source/sysman/memory/linux/os_memory_imp.h b/level_zero/tools/source/sysman/memory/linux/os_memory_imp.h
index 405083e77b..9892cdd18f 100644
--- a/level_zero/tools/source/sysman/memory/linux/os_memory_imp.h
+++ b/level_zero/tools/source/sysman/memory/linux/os_memory_imp.h
@@ -19,7 +19,7 @@ class SysfsAccess;
 struct Device;
 class PlatformMonitoringTech;
 class LinuxSysmanImp;
-class LinuxMemoryImp : public OsMemory, NEO::NonCopyableOrMovableClass {
+class LinuxMemoryImp : public OsMemory, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_mem_properties_t *pProperties) override;
     ze_result_t getBandwidth(zes_mem_bandwidth_t *pBandwidth) override;
diff --git a/level_zero/tools/source/sysman/memory/memory_imp.h b/level_zero/tools/source/sysman/memory/memory_imp.h
index f529366198..3b051e4750 100644
--- a/level_zero/tools/source/sysman/memory/memory_imp.h
+++ b/level_zero/tools/source/sysman/memory/memory_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 
 namespace L0 {
 
-class MemoryImp : public Memory, NEO::NonCopyableOrMovableClass {
+class MemoryImp : public Memory, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t memoryGetProperties(zes_mem_properties_t *pProperties) override;
     ze_result_t memoryGetBandwidth(zes_mem_bandwidth_t *pBandwidth) override;
diff --git a/level_zero/tools/source/sysman/memory/windows/os_memory_imp.h b/level_zero/tools/source/sysman/memory/windows/os_memory_imp.h
index 95f4fbf890..f152e1d97f 100644
--- a/level_zero/tools/source/sysman/memory/windows/os_memory_imp.h
+++ b/level_zero/tools/source/sysman/memory/windows/os_memory_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -36,7 +36,7 @@ typedef PDH_STATUS(__stdcall *fn_PdhCloseQuery)(PDH_HQUERY hQuery);
 namespace L0 {
 class KmdSysManager;
 
-class WddmMemoryImp : public OsMemory, NEO::NonCopyableOrMovableClass {
+class WddmMemoryImp : public OsMemory, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_mem_properties_t *pProperties) override;
     ze_result_t getBandwidth(zes_mem_bandwidth_t *pBandwidth) override;
diff --git a/level_zero/tools/source/sysman/pci/linux/os_pci_imp.h b/level_zero/tools/source/sysman/pci/linux/os_pci_imp.h
index 0c032cd5bb..0244fcfcfa 100644
--- a/level_zero/tools/source/sysman/pci/linux/os_pci_imp.h
+++ b/level_zero/tools/source/sysman/pci/linux/os_pci_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -18,7 +18,7 @@ class FsAccess;
 class LinuxSysmanImp;
 struct OsSysman;
 
-class LinuxPciImp : public OsPci, NEO::NonCopyableOrMovableClass {
+class LinuxPciImp : public OsPci, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getPciBdf(zes_pci_properties_t &pciProperties) override;
     void getMaxLinkCaps(double &maxLinkSpeed, int32_t &maxLinkWidth) override;
diff --git a/level_zero/tools/source/sysman/pci/pci_imp.h b/level_zero/tools/source/sysman/pci/pci_imp.h
index 7b48189c65..82ddbfb3a1 100644
--- a/level_zero/tools/source/sysman/pci/pci_imp.h
+++ b/level_zero/tools/source/sysman/pci/pci_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,7 @@ namespace L0 {
 
 class OsPci;
 struct OsSysman;
-class PciImp : public Pci, NEO::NonCopyableOrMovableClass {
+class PciImp : public Pci, NEO::NonCopyableAndNonMovableClass {
   public:
     void init() override;
     ze_result_t pciStaticProperties(zes_pci_properties_t *pProperties) override;
diff --git a/level_zero/tools/source/sysman/pci/windows/os_pci_imp.h b/level_zero/tools/source/sysman/pci/windows/os_pci_imp.h
index 26d11f884d..0289151dd5 100644
--- a/level_zero/tools/source/sysman/pci/windows/os_pci_imp.h
+++ b/level_zero/tools/source/sysman/pci/windows/os_pci_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,7 +12,7 @@
 
 namespace L0 {
 class KmdSysManager;
-class WddmPciImp : public OsPci, NEO::NonCopyableOrMovableClass {
+class WddmPciImp : public OsPci, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getPciBdf(zes_pci_properties_t &pciProperties) override;
     void getMaxLinkCaps(double &maxLinkSpeed, int32_t &maxLinkWidth) override;
diff --git a/level_zero/tools/source/sysman/performance/linux/os_performance_imp.h b/level_zero/tools/source/sysman/performance/linux/os_performance_imp.h
index b3d1d0d104..900244ae55 100644
--- a/level_zero/tools/source/sysman/performance/linux/os_performance_imp.h
+++ b/level_zero/tools/source/sysman/performance/linux/os_performance_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 
 namespace L0 {
 
-class LinuxPerformanceImp : public OsPerformance, NEO::NonCopyableOrMovableClass {
+class LinuxPerformanceImp : public OsPerformance, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t osPerformanceGetProperties(zes_perf_properties_t &pProperties) override;
     ze_result_t osPerformanceGetConfig(double *pFactor) override;
diff --git a/level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.h b/level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.h
index 55338fe6e3..8eb539f603 100644
--- a/level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.h
+++ b/level_zero/tools/source/sysman/performance/linux/os_performance_imp_prelim.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 
 namespace L0 {
 
-class LinuxPerformanceImp : public OsPerformance, NEO::NonCopyableOrMovableClass {
+class LinuxPerformanceImp : public OsPerformance, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t osPerformanceGetProperties(zes_perf_properties_t &pProperties) override;
     ze_result_t osPerformanceGetConfig(double *pFactor) override;
diff --git a/level_zero/tools/source/sysman/performance/performance_imp.h b/level_zero/tools/source/sysman/performance/performance_imp.h
index 923b8a0d80..4fa27ed98b 100644
--- a/level_zero/tools/source/sysman/performance/performance_imp.h
+++ b/level_zero/tools/source/sysman/performance/performance_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 
 namespace L0 {
 
-class PerformanceImp : public Performance, NEO::NonCopyableOrMovableClass {
+class PerformanceImp : public Performance, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t performanceGetProperties(zes_perf_properties_t *pProperties) override;
     ze_result_t performanceGetConfig(double *pFactor) override;
diff --git a/level_zero/tools/source/sysman/power/linux/os_power_imp.h b/level_zero/tools/source/sysman/power/linux/os_power_imp.h
index 1555f2960f..a545b65b1d 100644
--- a/level_zero/tools/source/sysman/power/linux/os_power_imp.h
+++ b/level_zero/tools/source/sysman/power/linux/os_power_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,7 @@ namespace L0 {
 
 class SysfsAccess;
 class PlatformMonitoringTech;
-class LinuxPowerImp : public OsPower, NEO::NonCopyableOrMovableClass {
+class LinuxPowerImp : public OsPower, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_power_properties_t *pProperties) override;
     ze_result_t getEnergyCounter(zes_power_energy_counter_t *pEnergy) override;
diff --git a/level_zero/tools/source/sysman/power/linux/os_power_imp_prelim.h b/level_zero/tools/source/sysman/power/linux/os_power_imp_prelim.h
index b774268c04..1e934e6119 100644
--- a/level_zero/tools/source/sysman/power/linux/os_power_imp_prelim.h
+++ b/level_zero/tools/source/sysman/power/linux/os_power_imp_prelim.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -20,7 +20,7 @@ namespace L0 {
 
 class SysfsAccess;
 class PlatformMonitoringTech;
-class LinuxPowerImp : public OsPower, NEO::NonCopyableOrMovableClass {
+class LinuxPowerImp : public OsPower, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_power_properties_t *pProperties) override;
     ze_result_t getEnergyCounter(zes_power_energy_counter_t *pEnergy) override;
diff --git a/level_zero/tools/source/sysman/power/power_imp.h b/level_zero/tools/source/sysman/power/power_imp.h
index 198a624c5c..e055b89043 100644
--- a/level_zero/tools/source/sysman/power/power_imp.h
+++ b/level_zero/tools/source/sysman/power/power_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,7 +13,7 @@
 #include "level_zero/tools/source/sysman/power/power.h"
 #include <level_zero/zet_api.h>
 namespace L0 {
-class PowerImp : public Power, NEO::NonCopyableOrMovableClass {
+class PowerImp : public Power, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t powerGetProperties(zes_power_properties_t *pProperties) override;
     ze_result_t powerGetEnergyCounter(zes_power_energy_counter_t *pEnergy) override;
diff --git a/level_zero/tools/source/sysman/power/windows/os_power_imp.h b/level_zero/tools/source/sysman/power/windows/os_power_imp.h
index 4dd39a2c3b..0c0b5315bd 100644
--- a/level_zero/tools/source/sysman/power/windows/os_power_imp.h
+++ b/level_zero/tools/source/sysman/power/windows/os_power_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,7 +13,7 @@
 
 namespace L0 {
 class KmdSysManager;
-class WddmPowerImp : public OsPower, NEO::NonCopyableOrMovableClass {
+class WddmPowerImp : public OsPower, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_power_properties_t *pProperties) override;
     ze_result_t getEnergyCounter(zes_power_energy_counter_t *pEnergy) override;
diff --git a/level_zero/tools/source/sysman/ras/linux/os_ras_imp.h b/level_zero/tools/source/sysman/ras/linux/os_ras_imp.h
index 24aa0b9506..635e4b7434 100644
--- a/level_zero/tools/source/sysman/ras/linux/os_ras_imp.h
+++ b/level_zero/tools/source/sysman/ras/linux/os_ras_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -25,7 +25,7 @@ class LinuxRasSources;
 class FirmwareUtil;
 struct Device;
 
-class LinuxRasImp : public OsRas, NEO::NonCopyableOrMovableClass {
+class LinuxRasImp : public OsRas, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t osRasGetProperties(zes_ras_properties_t &properties) override;
     ze_result_t osRasGetState(zes_ras_state_t &state, ze_bool_t clear) override;
@@ -51,7 +51,7 @@ class LinuxRasImp : public OsRas, NEO::NonCopyableOrMovableClass {
     uint64_t categoryThreshold[maxRasErrorCategoryCount] = {0};
 };
 
-class LinuxRasSources : NEO::NonCopyableOrMovableClass {
+class LinuxRasSources : NEO::NonCopyableAndNonMovableClass {
   public:
     virtual ze_result_t osRasGetState(zes_ras_state_t &state, ze_bool_t clear) = 0;
     virtual ze_result_t osRasGetStateExp(uint32_t numCategoriesRequested, zes_ras_state_exp_t *pState) = 0;
diff --git a/level_zero/tools/source/sysman/ras/ras_imp.h b/level_zero/tools/source/sysman/ras/ras_imp.h
index 2c004663b8..b10674d9a6 100644
--- a/level_zero/tools/source/sysman/ras/ras_imp.h
+++ b/level_zero/tools/source/sysman/ras/ras_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 
 namespace L0 {
 
-class RasImp : public Ras, NEO::NonCopyableOrMovableClass {
+class RasImp : public Ras, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t rasGetProperties(zes_ras_properties_t *pProperties) override;
     ze_result_t rasGetConfig(zes_ras_config_t *pConfig) override;
diff --git a/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h b/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h
index 8aa6a02789..c934735eec 100644
--- a/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h
+++ b/level_zero/tools/source/sysman/scheduler/linux/os_scheduler_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,7 +21,7 @@ struct Device;
 // zes_sched_timeslice_properties_t.interval = timeslice_duration_ms
 // zes_sched_timeslice_properties_t.yieldTimeout = preempt_timeout_ms
 // zes_sched_timeout_properties_t. watchdogTimeout =  heartbeat_interval_ms
-class LinuxSchedulerImp : public OsScheduler, NEO::NonCopyableOrMovableClass {
+class LinuxSchedulerImp : public OsScheduler, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t setExclusiveMode(ze_bool_t *pNeedReload) override;
     ze_result_t getCurrentMode(zes_sched_mode_t *pMode) override;
diff --git a/level_zero/tools/source/sysman/scheduler/scheduler.h b/level_zero/tools/source/sysman/scheduler/scheduler.h
index cab40d1a69..9abc29c9dd 100644
--- a/level_zero/tools/source/sysman/scheduler/scheduler.h
+++ b/level_zero/tools/source/sysman/scheduler/scheduler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -36,7 +36,7 @@ class Scheduler : _zes_sched_handle_t {
     bool initSuccess = false;
 };
 
-struct SchedulerHandleContext : NEO::NonCopyableOrMovableClass {
+struct SchedulerHandleContext : NEO::NonCopyableAndNonMovableClass {
     SchedulerHandleContext(OsSysman *pOsSysman);
     ~SchedulerHandleContext();
     void init(std::vector<ze_device_handle_t> &deviceHandles);
diff --git a/level_zero/tools/source/sysman/scheduler/scheduler_imp.h b/level_zero/tools/source/sysman/scheduler/scheduler_imp.h
index 3a579538ff..ad4fee17d3 100644
--- a/level_zero/tools/source/sysman/scheduler/scheduler_imp.h
+++ b/level_zero/tools/source/sysman/scheduler/scheduler_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 
 namespace L0 {
 
-class SchedulerImp : public Scheduler, NEO::NonCopyableOrMovableClass {
+class SchedulerImp : public Scheduler, NEO::NonCopyableAndNonMovableClass {
   public:
     void init();
     ze_result_t schedulerGetProperties(zes_sched_properties_t *pProperties) override;
diff --git a/level_zero/tools/source/sysman/standby/linux/os_standby_imp.h b/level_zero/tools/source/sysman/standby/linux/os_standby_imp.h
index 9740772e29..69f8c6714a 100644
--- a/level_zero/tools/source/sysman/standby/linux/os_standby_imp.h
+++ b/level_zero/tools/source/sysman/standby/linux/os_standby_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 
 namespace L0 {
 
-class LinuxStandbyImp : public OsStandby, NEO::NonCopyableOrMovableClass {
+class LinuxStandbyImp : public OsStandby, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getMode(zes_standby_promo_mode_t &mode) override;
     ze_result_t setMode(zes_standby_promo_mode_t mode) override;
diff --git a/level_zero/tools/source/sysman/standby/standby_imp.h b/level_zero/tools/source/sysman/standby/standby_imp.h
index 60600d33b4..604d0c5f1a 100644
--- a/level_zero/tools/source/sysman/standby/standby_imp.h
+++ b/level_zero/tools/source/sysman/standby/standby_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 
 namespace L0 {
 
-class StandbyImp : public Standby, NEO::NonCopyableOrMovableClass {
+class StandbyImp : public Standby, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t standbyGetProperties(zes_standby_properties_t *pProperties) override;
     ze_result_t standbyGetMode(zes_standby_promo_mode_t *pMode) override;
diff --git a/level_zero/tools/source/sysman/sysman_imp.h b/level_zero/tools/source/sysman/sysman_imp.h
index afd18387c1..604b15fcc3 100644
--- a/level_zero/tools/source/sysman/sysman_imp.h
+++ b/level_zero/tools/source/sysman/sysman_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -16,7 +16,7 @@
 
 namespace L0 {
 
-struct SysmanDeviceImp : SysmanDevice, NEO::NonCopyableOrMovableClass {
+struct SysmanDeviceImp : SysmanDevice, NEO::NonCopyableAndNonMovableClass {
 
     SysmanDeviceImp(ze_device_handle_t hDevice);
     ~SysmanDeviceImp() override;
diff --git a/level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.h b/level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.h
index 289615865a..5d6f1f35fb 100644
--- a/level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.h
+++ b/level_zero/tools/source/sysman/temperature/linux/os_temperature_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,7 +19,7 @@ namespace L0 {
 class SysfsAccess;
 class PlatformMonitoringTech;
 struct Device;
-class LinuxTemperatureImp : public OsTemperature, NEO::NonCopyableOrMovableClass {
+class LinuxTemperatureImp : public OsTemperature, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_temp_properties_t *pProperties) override;
     ze_result_t getSensorTemperature(double *pTemperature) override;
diff --git a/level_zero/tools/source/sysman/temperature/temperature_imp.h b/level_zero/tools/source/sysman/temperature/temperature_imp.h
index 3eaeebe89a..a55f5056b5 100644
--- a/level_zero/tools/source/sysman/temperature/temperature_imp.h
+++ b/level_zero/tools/source/sysman/temperature/temperature_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2021 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,7 +12,7 @@
 #include "level_zero/tools/source/sysman/temperature/os_temperature.h"
 #include "level_zero/tools/source/sysman/temperature/temperature.h"
 namespace L0 {
-class TemperatureImp : public Temperature, NEO::NonCopyableOrMovableClass {
+class TemperatureImp : public Temperature, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t temperatureGetProperties(zes_temp_properties_t *pProperties) override;
     ze_result_t temperatureGetConfig(zes_temp_config_t *pConfig) override;
diff --git a/level_zero/tools/source/sysman/temperature/windows/os_temperature_imp.h b/level_zero/tools/source/sysman/temperature/windows/os_temperature_imp.h
index b0706530fa..2b6797786f 100644
--- a/level_zero/tools/source/sysman/temperature/windows/os_temperature_imp.h
+++ b/level_zero/tools/source/sysman/temperature/windows/os_temperature_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -13,7 +13,7 @@
 
 namespace L0 {
 class KmdSysManager;
-class WddmTemperatureImp : public OsTemperature, NEO::NonCopyableOrMovableClass {
+class WddmTemperatureImp : public OsTemperature, NEO::NonCopyableAndNonMovableClass {
   public:
     ze_result_t getProperties(zes_temp_properties_t *pProperties) override;
     ze_result_t getSensorTemperature(double *pTemperature) override;
diff --git a/level_zero/tools/source/sysman/vf_management/linux/os_vf_imp.h b/level_zero/tools/source/sysman/vf_management/linux/os_vf_imp.h
index b8bea866b3..6354e41ad5 100644
--- a/level_zero/tools/source/sysman/vf_management/linux/os_vf_imp.h
+++ b/level_zero/tools/source/sysman/vf_management/linux/os_vf_imp.h
@@ -19,7 +19,7 @@
 namespace L0 {
 class SysfsAccess;
 
-class LinuxVfImp : public OsVf, NEO::NonCopyableOrMovableClass {
+class LinuxVfImp : public OsVf, NEO::NonCopyableAndNonMovableClass {
   public:
     struct EngineUtilsData {
         zes_engine_group_t engineType;
diff --git a/level_zero/tools/source/sysman/vf_management/vf_imp.h b/level_zero/tools/source/sysman/vf_management/vf_imp.h
index f0183e2be2..bb7df261d1 100644
--- a/level_zero/tools/source/sysman/vf_management/vf_imp.h
+++ b/level_zero/tools/source/sysman/vf_management/vf_imp.h
@@ -16,7 +16,7 @@
 
 namespace L0 {
 
-class VfImp : public VfManagement, NEO::NonCopyableOrMovableClass {
+class VfImp : public VfManagement, NEO::NonCopyableAndNonMovableClass {
   public:
     void init();
     ze_result_t vfGetCapabilities(zes_vf_exp2_capabilities_t *pCapability) override;
diff --git a/level_zero/tools/source/sysman/windows/os_sysman_imp.h b/level_zero/tools/source/sysman/windows/os_sysman_imp.h
index 1d986824df..6609261865 100644
--- a/level_zero/tools/source/sysman/windows/os_sysman_imp.h
+++ b/level_zero/tools/source/sysman/windows/os_sysman_imp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,7 +21,7 @@ class KmdSysManager;
 
 struct Device;
 
-class WddmSysmanImp : public OsSysman, NEO::NonCopyableOrMovableClass {
+class WddmSysmanImp : public OsSysman, NEO::NonCopyableAndNonMovableClass {
   public:
     WddmSysmanImp(SysmanDeviceImp *pParentSysmanDeviceImp);
     ~WddmSysmanImp() override;
diff --git a/opencl/source/built_ins/builtins_dispatch_builder.h b/opencl/source/built_ins/builtins_dispatch_builder.h
index e2d5f89109..b3b34d2506 100644
--- a/opencl/source/built_ins/builtins_dispatch_builder.h
+++ b/opencl/source/built_ins/builtins_dispatch_builder.h
@@ -114,7 +114,7 @@ class BuiltInDispatchBuilderOp {
     static BuiltinDispatchInfoBuilder &getBuiltinDispatchInfoBuilder(EBuiltInOps::Type op, ClDevice &device);
 };
 
-class BuiltInOwnershipWrapper : public NonCopyableOrMovableClass {
+class BuiltInOwnershipWrapper : public NonCopyableAndNonMovableClass {
   public:
     BuiltInOwnershipWrapper() = default;
     BuiltInOwnershipWrapper(BuiltinDispatchInfoBuilder &inputBuilder, Context *context);
@@ -126,6 +126,6 @@ class BuiltInOwnershipWrapper : public NonCopyableOrMovableClass {
     BuiltinDispatchInfoBuilder *builder = nullptr;
 };
 
-static_assert(NEO::NonCopyableOrMovable<BuiltInOwnershipWrapper>);
+static_assert(NEO::NonCopyableAndNonMovable<BuiltInOwnershipWrapper>);
 
 } // namespace NEO
diff --git a/opencl/source/program/printf_handler.h b/opencl/source/program/printf_handler.h
index af0db217b9..9ab8448aef 100644
--- a/opencl/source/program/printf_handler.h
+++ b/opencl/source/program/printf_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2023 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -20,7 +20,7 @@ class GraphicsAllocation;
 class Device;
 struct MultiDispatchInfo;
 
-class PrintfHandler : NonCopyableOrMovableClass {
+class PrintfHandler : NonCopyableAndNonMovableClass {
   public:
     static PrintfHandler *create(const MultiDispatchInfo &multiDispatchInfo, Device &deviceArg);
 
diff --git a/opencl/source/utilities/cl_logger.h b/opencl/source/utilities/cl_logger.h
index 015f8897f4..ca129a8c0f 100644
--- a/opencl/source/utilities/cl_logger.h
+++ b/opencl/source/utilities/cl_logger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2023 Intel Corporation
+ * Copyright (C) 2021-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,7 @@ namespace NEO {
 struct MultiDispatchInfo;
 
 template <DebugFunctionalityLevel debugLevel>
-class ClFileLogger : public NonCopyableOrMovableClass {
+class ClFileLogger : public NonCopyableAndNonMovableClass {
   public:
     ClFileLogger(FileLogger<debugLevel> &baseLoggerInm, const DebugVariables &flags);
 
diff --git a/shared/offline_compiler/source/decoder/helper.h b/shared/offline_compiler/source/decoder/helper.h
index e0125b11ad..a55ff6762a 100644
--- a/shared/offline_compiler/source/decoder/helper.h
+++ b/shared/offline_compiler/source/decoder/helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -34,7 +34,7 @@ size_t findPos(const std::vector<std::string> &lines, const std::string &whatToF
 
 PRODUCT_FAMILY getProductFamilyFromDeviceName(const std::string &deviceName);
 
-class MessagePrinter : NEO::NonCopyableOrMovableClass {
+class MessagePrinter : NEO::NonCopyableAndNonMovableClass {
   public:
     explicit MessagePrinter() = default;
     explicit MessagePrinter(bool suppressMessages) : suppressMessages(suppressMessages) {}
diff --git a/shared/source/assert_handler/assert_handler.h b/shared/source/assert_handler/assert_handler.h
index ac46333c10..19fd2263e1 100644
--- a/shared/source/assert_handler/assert_handler.h
+++ b/shared/source/assert_handler/assert_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -27,7 +27,7 @@ static_assert(sizeof(AssertBufferHeader) == 3u * sizeof(uint32_t));
 
 #pragma pack()
 
-class AssertHandler : NonCopyableOrMovableClass {
+class AssertHandler : NonCopyableAndNonMovableClass {
   public:
     AssertHandler(Device *device);
     MOCKABLE_VIRTUAL ~AssertHandler();
diff --git a/shared/source/aub/aub_helper.h b/shared/source/aub/aub_helper.h
index 13b5aa4c9b..b02cc76ace 100644
--- a/shared/source/aub/aub_helper.h
+++ b/shared/source/aub/aub_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -17,7 +17,7 @@ namespace NEO {
 class ReleaseHelper;
 struct HardwareInfo;
 
-class AubHelper : public NonCopyableOrMovableClass {
+class AubHelper : public NonCopyableAndNonMovableClass {
   public:
     static bool isOneTimeAubWritableAllocationType(const AllocationType &type);
     static uint64_t getTotalMemBankSize(const ReleaseHelper *releaseHelper);
diff --git a/shared/source/command_container/cmdcontainer.h b/shared/source/command_container/cmdcontainer.h
index 66b2bb229c..c84c34c80b 100644
--- a/shared/source/command_container/cmdcontainer.h
+++ b/shared/source/command_container/cmdcontainer.h
@@ -58,7 +58,7 @@ struct HeapReserveArguments {
     size_t alignment = 0;
 };
 
-class CommandContainer : public NonCopyableOrMovableClass {
+class CommandContainer : public NonCopyableAndNonMovableClass {
   public:
     enum class ErrorCode {
         success = 0,
@@ -272,6 +272,6 @@ class CommandContainer : public NonCopyableOrMovableClass {
     bool globalBindlessHeapsEnabled = false;
 };
 
-static_assert(NEO::NonCopyableOrMovable<CommandContainer>);
+static_assert(NEO::NonCopyableAndNonMovable<CommandContainer>);
 
 } // namespace NEO
diff --git a/shared/source/command_stream/scratch_space_controller.h b/shared/source/command_stream/scratch_space_controller.h
index bea803bdb0..bc4bbef358 100644
--- a/shared/source/command_stream/scratch_space_controller.h
+++ b/shared/source/command_stream/scratch_space_controller.h
@@ -29,7 +29,7 @@ inline constexpr size_t scratchSpaceOffsetFor64Bit = 4096u;
 
 using ResidencyContainer = std::vector<GraphicsAllocation *>;
 
-class ScratchSpaceController : NonCopyableOrMovableClass {
+class ScratchSpaceController : NonCopyableAndNonMovableClass {
   public:
     ScratchSpaceController(uint32_t rootDeviceIndex, ExecutionEnvironment &environment, InternalAllocationStorage &allocationStorage);
     virtual ~ScratchSpaceController();
diff --git a/shared/source/debugger/debugger_l0.h b/shared/source/debugger/debugger_l0.h
index 4d59fca7cd..5f355b6097 100644
--- a/shared/source/debugger/debugger_l0.h
+++ b/shared/source/debugger/debugger_l0.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -71,7 +71,7 @@ static_assert(sizeof(DebugAreaHeader) == 32u * sizeof(uint8_t));
 
 #pragma pack()
 
-class DebuggerL0 : public NEO::Debugger, NEO::NonCopyableOrMovableClass {
+class DebuggerL0 : public NEO::Debugger, NEO::NonCopyableAndNonMovableClass {
   public:
     static std::unique_ptr<Debugger> create(NEO::Device *device);
 
diff --git a/shared/source/device/device.h b/shared/source/device/device.h
index 26c801389e..62be551d74 100644
--- a/shared/source/device/device.h
+++ b/shared/source/device/device.h
@@ -42,7 +42,7 @@ class UsmMemAllocPoolsManager;
 enum class EngineGroupType : uint32_t;
 struct PhysicalDevicePciBusInfo;
 
-struct SelectorCopyEngine : NonCopyableOrMovableClass {
+struct SelectorCopyEngine : NonCopyableAndNonMovableClass {
     std::atomic<bool> isMainUsed = false;
     std::atomic<uint32_t> selector = 0;
 };
diff --git a/shared/source/device_binary_format/zebin/zeinfo.h b/shared/source/device_binary_format/zebin/zeinfo.h
index ca964c100f..53cbd9d306 100644
--- a/shared/source/device_binary_format/zebin/zeinfo.h
+++ b/shared/source/device_binary_format/zebin/zeinfo.h
@@ -399,7 +399,7 @@ struct ExecutionEnvExt;
 ExecutionEnvExt *allocateExecEnvExt();
 void freeExecEnvExt(ExecutionEnvExt *);
 
-struct ExecutionEnvBaseT final : NEO::NonCopyableOrMovableClass {
+struct ExecutionEnvBaseT final : NEO::NonCopyableAndNonMovableClass {
     ExecutionEnvBaseT() {
         execEnvExt = allocateExecEnvExt();
     }
diff --git a/shared/source/direct_submission/direct_submission_hw_diagnostic_mode.h b/shared/source/direct_submission/direct_submission_hw_diagnostic_mode.h
index 9d03cc6281..0ea558bf72 100644
--- a/shared/source/direct_submission/direct_submission_hw_diagnostic_mode.h
+++ b/shared/source/direct_submission/direct_submission_hw_diagnostic_mode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2023 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -28,7 +28,7 @@ struct DirectSubmissionSingleDelta {
 
 using DirectSubmissionExecution = std::vector<DirectSubmissionSingleDelta>;
 
-class DirectSubmissionDiagnosticsCollector : NonCopyableOrMovableClass {
+class DirectSubmissionDiagnosticsCollector : NonCopyableAndNonMovableClass {
   public:
     DirectSubmissionDiagnosticsCollector(uint32_t executions,
                                          bool storeExecutions,
diff --git a/shared/source/gmm_helper/resource_info.h b/shared/source/gmm_helper/resource_info.h
index 8e8b11e522..f94510dcf4 100644
--- a/shared/source/gmm_helper/resource_info.h
+++ b/shared/source/gmm_helper/resource_info.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@
 
 namespace NEO {
 class GmmClientContext;
-class GmmResourceInfo : NonCopyableOrMovableClass {
+class GmmResourceInfo : NonCopyableAndNonMovableClass {
   public:
     static GmmResourceInfo *create(GmmClientContext *clientContext, GMM_RESCREATE_PARAMS *resourceCreateParams);
 
diff --git a/shared/source/helpers/non_copyable_or_moveable.h b/shared/source/helpers/non_copyable_or_moveable.h
index 908ada3b48..dab5cd091c 100644
--- a/shared/source/helpers/non_copyable_or_moveable.h
+++ b/shared/source/helpers/non_copyable_or_moveable.h
@@ -10,14 +10,14 @@
 #include <type_traits>
 
 namespace NEO {
-class NonCopyableOrMovableClass {
+class NonCopyableAndNonMovableClass {
   public:
-    NonCopyableOrMovableClass() = default;
-    NonCopyableOrMovableClass(const NonCopyableOrMovableClass &) = delete;
-    NonCopyableOrMovableClass &operator=(const NonCopyableOrMovableClass &) = delete;
+    NonCopyableAndNonMovableClass() = default;
+    NonCopyableAndNonMovableClass(const NonCopyableAndNonMovableClass &) = delete;
+    NonCopyableAndNonMovableClass &operator=(const NonCopyableAndNonMovableClass &) = delete;
 
-    NonCopyableOrMovableClass(NonCopyableOrMovableClass &&) = delete;
-    NonCopyableOrMovableClass &operator=(NonCopyableOrMovableClass &&) = delete;
+    NonCopyableAndNonMovableClass(NonCopyableAndNonMovableClass &&) = delete;
+    NonCopyableAndNonMovableClass &operator=(NonCopyableAndNonMovableClass &&) = delete;
 };
 
 class NonCopyableClass {
@@ -31,7 +31,7 @@ class NonCopyableClass {
 };
 
 template <typename T>
-concept NonCopyableOrMovable = !
+concept NonCopyableAndNonMovable = !
 std::is_copy_constructible_v<T> &&
     !std::is_copy_assignable_v<T> &&
     !std::is_move_constructible_v<T> &&
diff --git a/shared/source/helpers/ray_tracing_helper.h b/shared/source/helpers/ray_tracing_helper.h
index afe77a8ae3..7999da1376 100644
--- a/shared/source/helpers/ray_tracing_helper.h
+++ b/shared/source/helpers/ray_tracing_helper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -20,7 +20,7 @@
 #include <cstdint>
 
 namespace NEO {
-class RayTracingHelper : public NonCopyableOrMovableClass {
+class RayTracingHelper : public NonCopyableAndNonMovableClass {
   public:
     static constexpr uint32_t hitInfoSize = 64;
     static constexpr uint32_t bvhStackSize = 96;
diff --git a/shared/source/kernel/kernel_descriptor.h b/shared/source/kernel/kernel_descriptor.h
index 41019e59fb..89f04cbc31 100644
--- a/shared/source/kernel/kernel_descriptor.h
+++ b/shared/source/kernel/kernel_descriptor.h
@@ -33,7 +33,7 @@ struct KernelDescriptorExt;
 KernelDescriptorExt *allocateKernelDescriptorExt();
 void freeKernelDescriptorExt(KernelDescriptorExt *);
 
-struct KernelDescriptor : NEO::NonCopyableOrMovableClass {
+struct KernelDescriptor : NEO::NonCopyableAndNonMovableClass {
     static bool isBindlessAddressingKernel(const KernelDescriptor &desc);
 
     enum AddressingMode : uint8_t {
diff --git a/shared/source/memory_manager/local_memory_usage.h b/shared/source/memory_manager/local_memory_usage.h
index 85889c0271..48125f9ef0 100644
--- a/shared/source/memory_manager/local_memory_usage.h
+++ b/shared/source/memory_manager/local_memory_usage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2023 Intel Corporation
+ * Copyright (C) 2019-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 #include <memory>
 
 namespace NEO {
-class LocalMemoryUsageBankSelector : public NonCopyableOrMovableClass {
+class LocalMemoryUsageBankSelector : public NonCopyableAndNonMovableClass {
   public:
     LocalMemoryUsageBankSelector() = delete;
     LocalMemoryUsageBankSelector(uint32_t banksCount);
diff --git a/shared/source/memory_manager/prefetch_manager.h b/shared/source/memory_manager/prefetch_manager.h
index c14cb9412a..8a2f08f1f4 100644
--- a/shared/source/memory_manager/prefetch_manager.h
+++ b/shared/source/memory_manager/prefetch_manager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2022-2023 Intel Corporation
+ * Copyright (C) 2022-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -25,7 +25,7 @@ struct PrefetchContext {
     SpinLock lock;
 };
 
-class PrefetchManager : public NonCopyableOrMovableClass {
+class PrefetchManager : public NonCopyableAndNonMovableClass {
   public:
     static std::unique_ptr<PrefetchManager> create();
 
diff --git a/shared/source/os_interface/linux/file_descriptor.h b/shared/source/os_interface/linux/file_descriptor.h
index 8953f131a7..537e28d941 100644
--- a/shared/source/os_interface/linux/file_descriptor.h
+++ b/shared/source/os_interface/linux/file_descriptor.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,7 +12,7 @@
 
 namespace NEO {
 
-class FileDescriptor : NonCopyableOrMovableClass {
+class FileDescriptor : NonCopyableAndNonMovableClass {
   public:
     FileDescriptor(const char *file, int flags) : handle(SysCalls::open(file, flags)) {}
 
diff --git a/shared/source/os_interface/windows/os_library_win.h b/shared/source/os_interface/windows/os_library_win.h
index c108106003..bfe821d430 100644
--- a/shared/source/os_interface/windows/os_library_win.h
+++ b/shared/source/os_interface/windows/os_library_win.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Intel Corporation
+ * Copyright (C) 2019-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -15,7 +15,7 @@
 namespace NEO {
 namespace Windows {
 
-class OsLibrary : public NEO::OsLibrary, NEO::NonCopyableOrMovableClass {
+class OsLibrary : public NEO::OsLibrary, NEO::NonCopyableAndNonMovableClass {
   private:
     HMODULE handle;
 
diff --git a/shared/source/os_interface/windows/wddm/wddm_residency_logger.h b/shared/source/os_interface/windows/wddm/wddm_residency_logger.h
index cea69fe554..e1062b58ab 100644
--- a/shared/source/os_interface/windows/wddm/wddm_residency_logger.h
+++ b/shared/source/os_interface/windows/wddm/wddm_residency_logger.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2024 Intel Corporation
+ * Copyright (C) 2020-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -23,7 +23,7 @@ constexpr bool wddmResidencyLoggingAvailable = true;
 constexpr bool wddmResidencyLoggingAvailable = false;
 #endif
 
-class WddmResidencyLogger : NonCopyableOrMovableClass {
+class WddmResidencyLogger : NonCopyableAndNonMovableClass {
   public:
     WddmResidencyLogger(unsigned int device, volatile void *fenceValueCpuVirtualAddress, std::string outDirectory) {
         const char *wddmResidencyLoggerDefaultDirectory = "unk";
diff --git a/shared/source/program/sync_buffer_handler.h b/shared/source/program/sync_buffer_handler.h
index 0960b11db9..40ea1d0921 100644
--- a/shared/source/program/sync_buffer_handler.h
+++ b/shared/source/program/sync_buffer_handler.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2024 Intel Corporation
+ * Copyright (C) 2019-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,7 +19,7 @@ class Device;
 class GraphicsAllocation;
 class MemoryManager;
 
-class SyncBufferHandler : NonCopyableOrMovableClass {
+class SyncBufferHandler : NonCopyableAndNonMovableClass {
   public:
     ~SyncBufferHandler();
 
diff --git a/shared/source/utilities/tag_allocator.h b/shared/source/utilities/tag_allocator.h
index 2ff808a7c7..b9ba3ab516 100644
--- a/shared/source/utilities/tag_allocator.h
+++ b/shared/source/utilities/tag_allocator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2024 Intel Corporation
+ * Copyright (C) 2018-2025 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -31,7 +31,7 @@ class TagNode;
 
 class TagAllocatorBase;
 
-class TagNodeBase : public NonCopyableOrMovableClass {
+class TagNodeBase : public NonCopyableAndNonMovableClass {
   public:
     virtual ~TagNodeBase() = default;
 
diff --git a/shared/test/common/libult/ult_aub_command_stream_receiver.h b/shared/test/common/libult/ult_aub_command_stream_receiver.h
index 1c74ce5a98..c5d885783e 100644
--- a/shared/test/common/libult/ult_aub_command_stream_receiver.h
+++ b/shared/test/common/libult/ult_aub_command_stream_receiver.h
@@ -13,7 +13,7 @@
 namespace NEO {
 
 template <typename GfxFamily>
-class UltAubCommandStreamReceiver : public AUBCommandStreamReceiverHw<GfxFamily>, public NonCopyableOrMovableClass {
+class UltAubCommandStreamReceiver : public AUBCommandStreamReceiverHw<GfxFamily>, public NonCopyableAndNonMovableClass {
     using BaseClass = AUBCommandStreamReceiverHw<GfxFamily>;
 
   public:
diff --git a/shared/test/common/libult/ult_command_stream_receiver.h b/shared/test/common/libult/ult_command_stream_receiver.h
index dff887b104..f98d96cd8a 100644
--- a/shared/test/common/libult/ult_command_stream_receiver.h
+++ b/shared/test/common/libult/ult_command_stream_receiver.h
@@ -46,7 +46,7 @@ struct WriteMemoryParams {
 };
 
 template <typename GfxFamily>
-class UltCommandStreamReceiver : public CommandStreamReceiverHw<GfxFamily>, public NonCopyableOrMovableClass {
+class UltCommandStreamReceiver : public CommandStreamReceiverHw<GfxFamily>, public NonCopyableAndNonMovableClass {
     using BaseClass = CommandStreamReceiverHw<GfxFamily>;
 
   public: