refactor: Change wording from NonCopyableOrMovable to NonCopyableAndNonMovable

Signed-off-by: Filip Hazubski <filip.hazubski@intel.com>

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);
 

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

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

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;

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;

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;

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 {

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;

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;

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;

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;

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;

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;

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;

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();
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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);

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;

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;

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;

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);

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;

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;

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;

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;

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;

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;

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{};

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;

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;

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;

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);

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;

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);

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;

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;

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) {}

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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();
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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);

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;

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;

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);

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);

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;

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;

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;

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;

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;

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;