From 501c8e87d751063f55e81c2b80de69f4487011e8 Mon Sep 17 00:00:00 2001
From: shubham kumar <shubham.kumar@intel.com>
Date: Thu, 25 May 2023 21:15:46 +0000
Subject: [PATCH] fix: rename files under sysman to make them unique

Related-To: LOCI-4383

Signed-off-by: shubham kumar <shubham.kumar@intel.com>
---
 .../sysman/source/diagnostics/CMakeLists.txt  |  4 +--
 ...diagnostics.cpp => sysman_diagnostics.cpp} |  2 +-
 .../{diagnostics.h => sysman_diagnostics.h}   |  0
 level_zero/sysman/source/ecc/CMakeLists.txt   |  6 ++--
 .../sysman/source/ecc/linux/CMakeLists.txt    |  2 +-
 .../linux/{os_ecc.cpp => sysman_os_ecc.cpp}   |  4 +--
 .../sysman/source/ecc/{ecc.h => sysman_ecc.h} |  0
 .../ecc/{ecc_imp.cpp => sysman_ecc_imp.cpp}   |  4 +--
 .../ecc/{ecc_imp.h => sysman_ecc_imp.h}       |  2 +-
 .../sysman/source/ecc/windows/CMakeLists.txt  |  2 +-
 .../windows/{os_ecc.cpp => sysman_os_ecc.cpp} |  4 +--
 .../sysman/source/engine/CMakeLists.txt       | 10 +++----
 .../sysman/source/engine/linux/CMakeLists.txt |  6 ++--
 ...ngine_imp.cpp => sysman_os_engine_imp.cpp} |  8 ++---
 ...os_engine_imp.h => sysman_os_engine_imp.h} |  2 +-
 ...im.cpp => sysman_os_engine_imp_prelim.cpp} |  8 ++---
 .../engine/{engine.cpp => sysman_engine.cpp}  |  4 +--
 .../engine/{engine.h => sysman_engine.h}      |  0
 .../{engine_imp.cpp => sysman_engine_imp.cpp} |  2 +-
 .../{engine_imp.h => sysman_engine_imp.h}     |  4 +--
 .../{os_engine.h => sysman_os_engine.h}       |  2 +-
 .../source/engine/windows/CMakeLists.txt      |  4 +--
 ...ngine_imp.cpp => sysman_os_engine_imp.cpp} |  6 ++--
 ...os_engine_imp.h => sysman_os_engine_imp.h} |  4 +--
 .../sysman/source/fabric_port/CMakeLists.txt  | 10 +++----
 .../source/fabric_port/linux/CMakeLists.txt   | 18 +++++------
 ...access.h => sysman_fabric_device_access.h} |  2 +-
 ...pp => sysman_fabric_device_access_imp.cpp} |  4 +--
 ...mp.h => sysman_fabric_device_access_imp.h} |  6 ++--
 ...p => sysman_fabric_device_access_stub.cpp} |  4 +--
 ...b.h => sysman_fabric_device_access_stub.h} |  2 +-
 ..._imp.cpp => sysman_os_fabric_port_imp.cpp} |  2 +-
 ...port_imp.h => sysman_os_fabric_port_imp.h} |  6 ++--
 ...p => sysman_os_fabric_port_imp_prelim.cpp} |  4 +--
 ...m.h => sysman_os_fabric_port_imp_prelim.h} |  6 ++--
 ...fabric_port.cpp => sysman_fabric_port.cpp} |  4 +--
 .../{fabric_port.h => sysman_fabric_port.h}   |  0
 ...ort_imp.cpp => sysman_fabric_port_imp.cpp} |  2 +-
 ...ic_port_imp.h => sysman_fabric_port_imp.h} |  4 +--
 ..._fabric_port.h => sysman_os_fabric_port.h} |  0
 .../source/fabric_port/windows/CMakeLists.txt |  4 +--
 ..._imp.cpp => sysman_os_fabric_port_imp.cpp} |  2 +-
 ...port_imp.h => sysman_os_fabric_port_imp.h} |  4 +--
 .../sysman/source/firmware/CMakeLists.txt     | 10 +++----
 .../source/firmware/linux/CMakeLists.txt      |  8 ++---
 ...are_imp.cpp => sysman_os_firmware_imp.cpp} |  6 ++--
 ...irmware_imp.h => sysman_os_firmware_imp.h} |  6 ++--
 ....cpp => sysman_os_firmware_imp_helper.cpp} |  4 +--
 ... sysman_os_firmware_imp_helper_prelim.cpp} |  6 ++--
 .../{firmware.cpp => sysman_firmware.cpp}     |  2 +-
 .../{firmware.h => sysman_firmware.h}         |  0
 ...rmware_imp.cpp => sysman_firmware_imp.cpp} |  4 +--
 .../{firmware_imp.h => sysman_firmware_imp.h} |  4 +--
 .../{os_firmware.h => sysman_os_firmware.h}   |  0
 .../source/firmware/windows/CMakeLists.txt    |  4 +--
 ...are_imp.cpp => sysman_os_firmware_imp.cpp} |  4 +--
 ...irmware_imp.h => sysman_os_firmware_imp.h} |  2 +-
 .../source/firmware_util/CMakeLists.txt       | 16 +++++-----
 .../source/firmware_util/linux/CMakeLists.txt |  2 +-
 ...> sysman_os_firmware_util_enumeration.cpp} |  2 +-
 ...firmware_util.h => sysman_firmware_util.h} |  2 +-
 ...l_imp.cpp => sysman_firmware_util_imp.cpp} |  2 +-
 ..._util_imp.h => sysman_firmware_util_imp.h} |  2 +-
 ...pp => sysman_firmware_util_imp_helper.cpp} |  2 +-
 ....cpp => sysman_firmware_util_imp_stub.cpp} |  2 +-
 .../{igsc_wrapper.h => sysman_igsc_wrapper.h} |  0
 .../firmware_util/windows/CMakeLists.txt      |  2 +-
 ...> sysman_os_firmware_util_enumeration.cpp} |  2 +-
 .../sysman/source/frequency/CMakeLists.txt    | 10 +++----
 .../source/frequency/linux/CMakeLists.txt     |  8 ++---
 ...cy_imp.cpp => sysman_os_frequency_imp.cpp} |  4 +--
 ...quency_imp.h => sysman_os_frequency_imp.h} |  6 ++--
 ...cpp => sysman_os_frequency_imp_prelim.cpp} |  4 +--
 ...lim.h => sysman_os_frequency_imp_prelim.h} |  6 ++--
 .../{frequency.cpp => sysman_frequency.cpp}   |  6 ++--
 .../{frequency.h => sysman_frequency.h}       |  0
 ...uency_imp.cpp => sysman_frequency_imp.cpp} |  2 +-
 ...frequency_imp.h => sysman_frequency_imp.h} |  4 +--
 .../{os_frequency.h => sysman_os_frequency.h} |  0
 .../source/frequency/windows/CMakeLists.txt   |  4 +--
 ...cy_imp.cpp => sysman_os_frequency_imp.cpp} |  6 ++--
 ...quency_imp.h => sysman_os_frequency_imp.h} |  4 +--
 .../source/global_operations/CMakeLists.txt   | 10 +++----
 .../global_operations/linux/CMakeLists.txt    | 10 +++----
 ...=> sysman_os_global_operations_helper.cpp} |  2 +-
 ...an_os_global_operations_helper_prelim.cpp} |  4 +--
 ...pp => sysman_os_global_operations_imp.cpp} |  8 ++---
 ...mp.h => sysman_os_global_operations_imp.h} |  4 +--
 ...perations.h => sysman_global_operations.h} |  0
 ...p.cpp => sysman_global_operations_imp.cpp} |  2 +-
 ...s_imp.h => sysman_global_operations_imp.h} |  4 +--
 ...ations.h => sysman_os_global_operations.h} |  0
 .../global_operations/windows/CMakeLists.txt  |  6 ++--
 ...pp => sysman_os_global_operations_imp.cpp} |  2 +-
 ...mp.h => sysman_os_global_operations_imp.h} |  4 +--
 level_zero/sysman/source/linux/CMakeLists.txt | 12 ++++----
 .../sysman/source/linux/nl_api/CMakeLists.txt |  8 ++---
 .../{iaf_nl_api.cpp => sysman_iaf_nl_api.cpp} |  2 +-
 .../{iaf_nl_api.h => sysman_iaf_nl_api.h}     |  2 +-
 .../nl_api/{nl_api.cpp => sysman_nl_api.cpp}  |  2 +-
 .../nl_api/{nl_api.h => sysman_nl_api.h}      |  0
 .../sysman/source/linux/pmt/CMakeLists.txt    |  6 ++--
 .../linux/pmt/{pmt.cpp => sysman_pmt.cpp}     |  4 +--
 .../source/linux/pmt/{pmt.h => sysman_pmt.h}  |  2 +-
 .../{pmt_helper.cpp => sysman_pmt_helper.cpp} |  4 +--
 ...xml_offsets.h => sysman_pmt_xml_offsets.h} |  0
 .../sysman/source/linux/pmu/CMakeLists.txt    |  6 ++--
 .../source/linux/pmu/{pmu.h => sysman_pmu.h}  |  3 +-
 .../pmu/{pmu_imp.cpp => sysman_pmu_imp.cpp}   |  2 +-
 .../linux/pmu/{pmu_imp.h => sysman_pmu_imp.h} |  6 ++--
 .../{fs_access.cpp => sysman_fs_access.cpp}   |  2 +-
 .../linux/{fs_access.h => sysman_fs_access.h} |  0
 ...inux.cpp => sysman_hw_device_id_linux.cpp} |  2 +-
 ...id_linux.h => sysman_hw_device_id_linux.h} |  0
 ...s_sysman_imp.cpp => zes_os_sysman_imp.cpp} | 10 +++----
 .../{os_sysman_imp.h => zes_os_sysman_imp.h}  |  2 +-
 .../sysman/source/memory/CMakeLists.txt       | 10 +++----
 .../sysman/source/memory/linux/CMakeLists.txt | 12 ++++----
 ...emory_imp.cpp => sysman_os_memory_imp.cpp} |  4 +--
 ...os_memory_imp.h => sysman_os_memory_imp.h} |  2 +-
 ...p_dg1.cpp => sysman_os_memory_imp_dg1.cpp} |  4 +--
 ...im.cpp => sysman_os_memory_imp_prelim.cpp} |  6 ++--
 ...prelim.h => sysman_os_memory_imp_prelim.h} |  6 ++--
 .../memory/{memory.cpp => sysman_memory.cpp}  |  2 +-
 .../memory/{memory.h => sysman_memory.h}      |  0
 .../{memory_imp.cpp => sysman_memory_imp.cpp} |  2 +-
 .../{memory_imp.h => sysman_memory_imp.h}     |  4 +--
 .../{os_memory.h => sysman_os_memory.h}       |  0
 .../source/memory/windows/CMakeLists.txt      |  4 +--
 ...emory_imp.cpp => sysman_os_memory_imp.cpp} |  2 +-
 ...os_memory_imp.h => sysman_os_memory_imp.h} |  2 +-
 level_zero/sysman/source/pci/CMakeLists.txt   |  8 ++---
 .../sysman/source/pci/linux/CMakeLists.txt    |  4 +--
 .../{os_pci_imp.cpp => sysman_os_pci_imp.cpp} |  8 ++---
 .../{os_pci_imp.h => sysman_os_pci_imp.h}     |  2 +-
 .../source/pci/{os_pci.h => sysman_os_pci.h}  |  0
 .../sysman/source/pci/{pci.h => sysman_pci.h} |  0
 .../pci/{pci_imp.cpp => sysman_pci_imp.cpp}   |  4 +--
 .../pci/{pci_imp.h => sysman_pci_imp.h}       |  2 +-
 .../sysman/source/pci/windows/CMakeLists.txt  |  4 +--
 .../{os_pci_imp.cpp => sysman_os_pci_imp.cpp} |  2 +-
 .../{os_pci_imp.h => sysman_os_pci_imp.h}     |  2 +-
 .../sysman/source/performance/CMakeLists.txt  | 10 +++----
 .../source/performance/linux/CMakeLists.txt   |  8 ++---
 ..._imp.cpp => sysman_os_performance_imp.cpp} |  2 +-
 ...ance_imp.h => sysman_os_performance_imp.h} |  6 ++--
 ...p => sysman_os_performance_imp_prelim.cpp} |  2 +-
 ...m.h => sysman_os_performance_imp_prelim.h} |  8 ++---
 ..._performance.h => sysman_os_performance.h} |  0
 ...performance.cpp => sysman_performance.cpp} |  4 +--
 .../{performance.h => sysman_performance.h}   |  0
 ...nce_imp.cpp => sysman_performance_imp.cpp} |  2 +-
 ...ormance_imp.h => sysman_performance_imp.h} |  4 +--
 .../source/performance/windows/CMakeLists.txt |  4 +--
 ..._imp.cpp => sysman_os_performance_imp.cpp} |  2 +-
 ...ance_imp.h => sysman_os_performance_imp.h} |  4 +--
 level_zero/sysman/source/power/CMakeLists.txt | 10 +++----
 .../sysman/source/power/linux/CMakeLists.txt  |  8 ++---
 ..._power_imp.cpp => sysman_os_power_imp.cpp} |  6 ++--
 .../{os_power_imp.h => sysman_os_power_imp.h} |  2 +-
 ...lim.cpp => sysman_os_power_imp_prelim.cpp} |  6 ++--
 ..._prelim.h => sysman_os_power_imp_prelim.h} |  2 +-
 .../power/{os_power.h => sysman_os_power.h}   |  0
 .../power/{power.cpp => sysman_power.cpp}     |  4 +--
 .../source/power/{power.h => sysman_power.h}  |  0
 .../{power_imp.cpp => sysman_power_imp.cpp}   |  4 +--
 .../power/{power_imp.h => sysman_power_imp.h} |  2 +-
 .../source/power/windows/CMakeLists.txt       |  4 +--
 ..._power_imp.cpp => sysman_os_power_imp.cpp} |  6 ++--
 .../{os_power_imp.h => sysman_os_power_imp.h} |  2 +-
 level_zero/sysman/source/ras/CMakeLists.txt   | 10 +++----
 .../sysman/source/ras/linux/CMakeLists.txt    | 12 ++++----
 .../{os_ras_imp.cpp => sysman_os_ras_imp.cpp} |  4 +--
 .../{os_ras_imp.h => sysman_os_ras_imp.h}     |  4 +--
 ...as_imp_gt.cpp => sysman_os_ras_imp_gt.cpp} |  4 +--
 ..._imp_hbm.cpp => sysman_os_ras_imp_hbm.cpp} |  6 ++--
 ...relim.cpp => sysman_os_ras_imp_prelim.cpp} |  4 +--
 ...mp_prelim.h => sysman_os_ras_imp_prelim.h} |  6 ++--
 .../source/ras/{os_ras.h => sysman_os_ras.h}  |  0
 .../source/ras/{ras.cpp => sysman_ras.cpp}    |  2 +-
 .../sysman/source/ras/{ras.h => sysman_ras.h} |  0
 .../ras/{ras_imp.cpp => sysman_ras_imp.cpp}   |  2 +-
 .../ras/{ras_imp.h => sysman_ras_imp.h}       |  4 +--
 .../sysman/source/ras/windows/CMakeLists.txt  |  2 +-
 .../{os_ras_imp.cpp => sysman_os_ras_imp.cpp} |  2 +-
 .../sysman/source/scheduler/CMakeLists.txt    | 10 +++----
 .../source/scheduler/linux/CMakeLists.txt     |  6 ++--
 ...er_imp.cpp => sysman_os_scheduler_imp.cpp} |  6 ++--
 ...eduler_imp.h => sysman_os_scheduler_imp.h} |  4 +--
 ...cpp => sysman_os_scheduler_imp_prelim.cpp} |  6 ++--
 .../{os_scheduler.h => sysman_os_scheduler.h} |  0
 .../{scheduler.cpp => sysman_scheduler.cpp}   |  2 +-
 .../{scheduler.h => sysman_scheduler.h}       |  0
 ...duler_imp.cpp => sysman_scheduler_imp.cpp} |  2 +-
 ...scheduler_imp.h => sysman_scheduler_imp.h} |  4 +--
 .../source/scheduler/windows/CMakeLists.txt   |  4 +--
 ...er_imp.cpp => sysman_os_scheduler_imp.cpp} |  4 +--
 ...eduler_imp.h => sysman_os_scheduler_imp.h} |  2 +-
 .../sysman/source/standby/CMakeLists.txt      | 10 +++----
 .../source/standby/linux/CMakeLists.txt       |  4 +--
 ...ndby_imp.cpp => sysman_os_standby_imp.cpp} |  2 +-
 ..._standby_imp.h => sysman_os_standby_imp.h} |  8 ++---
 .../{os_standby.h => sysman_os_standby.h}     |  0
 .../{standby.cpp => sysman_standby.cpp}       |  4 +--
 .../standby/{standby.h => sysman_standby.h}   |  0
 ...standby_imp.cpp => sysman_standby_imp.cpp} |  2 +-
 .../{standby_imp.h => sysman_standby_imp.h}   |  4 +--
 .../source/standby/windows/CMakeLists.txt     |  2 +-
 ...ndby_imp.cpp => sysman_os_standby_imp.cpp} |  2 +-
 level_zero/sysman/source/sysman_device.h      | 30 +++++++++----------
 .../sysman/source/sysman_device_imp.cpp       |  6 ++--
 .../sysman/source/temperature/CMakeLists.txt  | 10 +++----
 .../source/temperature/linux/CMakeLists.txt   |  4 +--
 ..._imp.cpp => sysman_os_temperature_imp.cpp} |  4 +--
 ...ture_imp.h => sysman_os_temperature_imp.h} |  6 ++--
 ..._temperature.h => sysman_os_temperature.h} |  0
 ...temperature.cpp => sysman_temperature.cpp} |  2 +-
 .../{temperature.h => sysman_temperature.h}   |  0
 ...ure_imp.cpp => sysman_temperature_imp.cpp} |  2 +-
 ...erature_imp.h => sysman_temperature_imp.h} |  4 +--
 .../source/temperature/windows/CMakeLists.txt |  4 +--
 ..._imp.cpp => sysman_os_temperature_imp.cpp} |  4 +--
 ...ture_imp.h => sysman_os_temperature_imp.h} |  4 +--
 .../sysman/source/windows/CMakeLists.txt      | 12 ++++----
 ...ws.cpp => sysman_hw_device_id_windows.cpp} |  0
 .../windows/{kmd_sys.h => sysman_kmd_sys.h}   |  0
 ...manager.cpp => sysman_kmd_sys_manager.cpp} |  2 +-
 ...sys_manager.h => sysman_kmd_sys_manager.h} |  2 +-
 ...s_sysman_imp.cpp => zes_os_sysman_imp.cpp} |  6 ++--
 .../{os_sysman_imp.h => zes_os_sysman_imp.h}  |  4 +--
 .../unit_tests/sources/ecc/linux/mock_ecc.h   |  4 +--
 .../sources/engine/linux/mock_engine.h        |  8 ++---
 .../sources/engine/linux/mock_engine_prelim.h |  8 ++---
 .../engine/windows/test_zes_engine.cpp        |  2 +-
 .../fabric_port/linux/mock_fabric_device.h    |  6 ++--
 .../test_sysman_fabric_device_prelim.cpp      |  2 +-
 .../linux/test_sysman_fabric_port_prelim.cpp  |  6 ++--
 .../firmware/linux/mock_zes_sysman_firmware.h |  2 +-
 .../linux/mock_zes_sysman_firmware_prelim.h   |  2 +-
 .../firmware_util/mock_fw_util_fixture.h      |  2 +-
 .../sources/firmware_util/test_fw_util.cpp    |  2 +-
 .../firmware_util/test_fw_util_helper.cpp     |  2 +-
 .../frequency/linux/mock_sysfs_frequency.h    |  2 +-
 .../linux/mock_sysfs_frequency_prelim.h       |  2 +-
 .../frequency/windows/mock_frequency.h        |  2 +-
 .../frequency/windows/test_zes_frequency.cpp  |  2 +-
 .../linux/mock_global_operations.h            |  8 ++---
 .../sources/linux/mock_sysman_drm.h           |  2 +-
 .../sources/linux/mock_sysman_fixture.h       |  4 +--
 .../sources/linux/mock_sysman_hw_device_id.h  |  2 +-
 .../linux/nl_api/mock_iaf_nl_api_prelim.cpp   |  2 +-
 .../linux/nl_api/mock_iaf_nl_api_prelim.h     |  2 +-
 .../linux/nl_api/mock_nl_api_prelim.cpp       |  2 +-
 .../sources/linux/nl_api/mock_nl_api_prelim.h |  4 +--
 .../sources/linux/nl_api/mock_nl_dll.h        |  2 +-
 .../nl_api/test_sysman_iaf_nl_api_prelim.cpp  |  2 +-
 .../unit_tests/sources/linux/pmt/mock_pmt.h   |  2 +-
 .../unit_tests/sources/linux/pmu/mock_pmu.h   |  2 +-
 .../linux/test_sysman_hw_device_id.cpp        |  2 +-
 .../sources/memory/linux/mock_memory.h        |  6 ++--
 .../sources/memory/linux/mock_memory_prelim.h |  6 ++--
 .../linux/test_sysman_memory_prelim.cpp       |  4 +--
 .../sources/pci/linux/mock_sysfs_pci.h        |  6 ++--
 .../linux/mock_sysfs_performance.h            |  8 ++---
 .../linux/mock_sysfs_performance_prelim.h     |  8 ++---
 .../sources/power/linux/mock_sysfs_power.h    |  6 ++--
 .../power/linux/mock_sysfs_power_prelim.h     |  6 ++--
 .../sources/ras/linux/mock_fs_ras.h           |  8 ++---
 .../sources/ras/linux/mock_fs_ras_prelim.h    | 12 ++++----
 .../scheduler/linux/mock_sysfs_scheduler.h    |  4 +--
 .../linux/mock_sysfs_scheduler_prelim.h       |  4 +--
 .../standby/linux/mock_sysfs_standby.h        |  2 +-
 .../linux/mock_sysfs_temperature.h            |  8 ++---
 .../linux/test_zes_temperature.cpp            |  2 +-
 .../temperature/windows/mock_temperature.h    |  2 +-
 .../windows/test_zes_temperature.cpp          |  2 +-
 .../sources/windows/mock_kmd_sys_manager.h    |  2 +-
 .../sources/windows/mock_sysman_fixture.h     |  2 +-
 .../sources/windows/test_sysman_manager.cpp   |  2 +-
 279 files changed, 559 insertions(+), 558 deletions(-)
 rename level_zero/sysman/source/diagnostics/{diagnostics.cpp => sysman_diagnostics.cpp} (94%)
 rename level_zero/sysman/source/diagnostics/{diagnostics.h => sysman_diagnostics.h} (100%)
 rename level_zero/sysman/source/ecc/linux/{os_ecc.cpp => sysman_os_ecc.cpp} (77%)
 rename level_zero/sysman/source/ecc/{ecc.h => sysman_ecc.h} (100%)
 rename level_zero/sysman/source/ecc/{ecc_imp.cpp => sysman_ecc_imp.cpp} (96%)
 rename level_zero/sysman/source/ecc/{ecc_imp.h => sysman_ecc_imp.h} (95%)
 rename level_zero/sysman/source/ecc/windows/{os_ecc.cpp => sysman_os_ecc.cpp} (70%)
 rename level_zero/sysman/source/engine/linux/{os_engine_imp.cpp => sysman_os_engine_imp.cpp} (95%)
 rename level_zero/sysman/source/engine/linux/{os_engine_imp.h => sysman_os_engine_imp.h} (95%)
 rename level_zero/sysman/source/engine/linux/{os_engine_imp_prelim.cpp => sysman_os_engine_imp_prelim.cpp} (96%)
 rename level_zero/sysman/source/engine/{engine.cpp => sysman_engine.cpp} (94%)
 rename level_zero/sysman/source/engine/{engine.h => sysman_engine.h} (100%)
 rename level_zero/sysman/source/engine/{engine_imp.cpp => sysman_engine_imp.cpp} (93%)
 rename level_zero/sysman/source/engine/{engine_imp.h => sysman_engine_imp.h} (87%)
 rename level_zero/sysman/source/engine/{os_engine.h => sysman_os_engine.h} (93%)
 rename level_zero/sysman/source/engine/windows/{os_engine_imp.cpp => sysman_os_engine_imp.cpp} (94%)
 rename level_zero/sysman/source/engine/windows/{os_engine_imp.h => sysman_os_engine_imp.h} (86%)
 rename level_zero/sysman/source/fabric_port/linux/{fabric_device_access.h => sysman_fabric_device_access.h} (96%)
 rename level_zero/sysman/source/fabric_port/linux/{fabric_device_access_imp.cpp => sysman_fabric_device_access_imp.cpp} (98%)
 rename level_zero/sysman/source/fabric_port/linux/{fabric_device_access_imp.h => sysman_fabric_device_access_imp.h} (94%)
 rename level_zero/sysman/source/fabric_port/linux/{fabric_device_access_stub.cpp => sysman_fabric_device_access_stub.cpp} (94%)
 rename level_zero/sysman/source/fabric_port/linux/{fabric_device_access_stub.h => sysman_fabric_device_access_stub.h} (95%)
 rename level_zero/sysman/source/fabric_port/linux/{os_fabric_port_imp.cpp => sysman_os_fabric_port_imp.cpp} (96%)
 rename level_zero/sysman/source/fabric_port/linux/{os_fabric_port_imp.h => sysman_os_fabric_port_imp.h} (87%)
 rename level_zero/sysman/source/fabric_port/linux/{os_fabric_port_imp_prelim.cpp => sysman_os_fabric_port_imp_prelim.cpp} (98%)
 rename level_zero/sysman/source/fabric_port/linux/{os_fabric_port_imp_prelim.h => sysman_os_fabric_port_imp_prelim.h} (93%)
 rename level_zero/sysman/source/fabric_port/{fabric_port.cpp => sysman_fabric_port.cpp} (92%)
 rename level_zero/sysman/source/fabric_port/{fabric_port.h => sysman_fabric_port.h} (100%)
 rename level_zero/sysman/source/fabric_port/{fabric_port_imp.cpp => sysman_fabric_port_imp.cpp} (96%)
 rename level_zero/sysman/source/fabric_port/{fabric_port_imp.h => sysman_fabric_port_imp.h} (91%)
 rename level_zero/sysman/source/fabric_port/{os_fabric_port.h => sysman_os_fabric_port.h} (100%)
 rename level_zero/sysman/source/fabric_port/windows/{os_fabric_port_imp.cpp => sysman_os_fabric_port_imp.cpp} (96%)
 rename level_zero/sysman/source/fabric_port/windows/{os_fabric_port_imp.h => sysman_os_fabric_port_imp.h} (89%)
 rename level_zero/sysman/source/firmware/linux/{os_firmware_imp.cpp => sysman_os_firmware_imp.cpp} (92%)
 rename level_zero/sysman/source/firmware/linux/{os_firmware_imp.h => sysman_os_firmware_imp.h} (81%)
 rename level_zero/sysman/source/firmware/linux/{os_firmware_imp_helper.cpp => sysman_os_firmware_imp_helper.cpp} (79%)
 rename level_zero/sysman/source/firmware/linux/{os_firmware_imp_helper_prelim.cpp => sysman_os_firmware_imp_helper_prelim.cpp} (90%)
 rename level_zero/sysman/source/firmware/{firmware.cpp => sysman_firmware.cpp} (95%)
 rename level_zero/sysman/source/firmware/{firmware.h => sysman_firmware.h} (100%)
 rename level_zero/sysman/source/firmware/{firmware_imp.cpp => sysman_firmware_imp.cpp} (87%)
 rename level_zero/sysman/source/firmware/{firmware_imp.h => sysman_firmware_imp.h} (86%)
 rename level_zero/sysman/source/firmware/{os_firmware.h => sysman_os_firmware.h} (100%)
 rename level_zero/sysman/source/firmware/windows/{os_firmware_imp.cpp => sysman_os_firmware_imp.cpp} (83%)
 rename level_zero/sysman/source/firmware/windows/{os_firmware_imp.h => sysman_os_firmware_imp.h} (90%)
 rename level_zero/sysman/source/firmware_util/linux/{os_firmware_util_enumeration.cpp => sysman_os_firmware_util_enumeration.cpp} (74%)
 rename level_zero/sysman/source/firmware_util/{firmware_util.h => sysman_firmware_util.h} (95%)
 rename level_zero/sysman/source/firmware_util/{firmware_util_imp.cpp => sysman_firmware_util_imp.cpp} (99%)
 rename level_zero/sysman/source/firmware_util/{firmware_util_imp.h => sysman_firmware_util_imp.h} (99%)
 rename level_zero/sysman/source/firmware_util/{firmware_util_imp_helper.cpp => sysman_firmware_util_imp_helper.cpp} (99%)
 rename level_zero/sysman/source/firmware_util/{firmware_util_imp_stub.cpp => sysman_firmware_util_imp_stub.cpp} (79%)
 rename level_zero/sysman/source/firmware_util/{igsc_wrapper.h => sysman_igsc_wrapper.h} (100%)
 rename level_zero/sysman/source/firmware_util/windows/{os_firmware_util_enumeration.cpp => sysman_os_firmware_util_enumeration.cpp} (74%)
 rename level_zero/sysman/source/frequency/linux/{os_frequency_imp.cpp => sysman_os_frequency_imp.cpp} (99%)
 rename level_zero/sysman/source/frequency/linux/{os_frequency_imp.h => sysman_os_frequency_imp.h} (93%)
 rename level_zero/sysman/source/frequency/linux/{os_frequency_imp_prelim.cpp => sysman_os_frequency_imp_prelim.cpp} (99%)
 rename level_zero/sysman/source/frequency/linux/{os_frequency_imp_prelim.h => sysman_os_frequency_imp_prelim.h} (93%)
 rename level_zero/sysman/source/frequency/{frequency.cpp => sysman_frequency.cpp} (91%)
 rename level_zero/sysman/source/frequency/{frequency.h => sysman_frequency.h} (100%)
 rename level_zero/sysman/source/frequency/{frequency_imp.cpp => sysman_frequency_imp.cpp} (98%)
 rename level_zero/sysman/source/frequency/{frequency_imp.h => sysman_frequency_imp.h} (94%)
 rename level_zero/sysman/source/frequency/{os_frequency.h => sysman_os_frequency.h} (100%)
 rename level_zero/sysman/source/frequency/windows/{os_frequency_imp.cpp => sysman_os_frequency_imp.cpp} (99%)
 rename level_zero/sysman/source/frequency/windows/{os_frequency_imp.h => sysman_os_frequency_imp.h} (96%)
 rename level_zero/sysman/source/global_operations/linux/{os_global_operations_helper.cpp => sysman_os_global_operations_helper.cpp} (71%)
 rename level_zero/sysman/source/global_operations/linux/{os_global_operations_helper_prelim.cpp => sysman_os_global_operations_helper_prelim.cpp} (83%)
 rename level_zero/sysman/source/global_operations/linux/{os_global_operations_imp.cpp => sysman_os_global_operations_imp.cpp} (98%)
 rename level_zero/sysman/source/global_operations/linux/{os_global_operations_imp.h => sysman_os_global_operations_imp.h} (94%)
 rename level_zero/sysman/source/global_operations/{global_operations.h => sysman_global_operations.h} (100%)
 rename level_zero/sysman/source/global_operations/{global_operations_imp.cpp => sysman_global_operations_imp.cpp} (97%)
 rename level_zero/sysman/source/global_operations/{global_operations_imp.h => sysman_global_operations_imp.h} (86%)
 rename level_zero/sysman/source/global_operations/{os_global_operations.h => sysman_os_global_operations.h} (100%)
 rename level_zero/sysman/source/global_operations/windows/{os_global_operations_imp.cpp => sysman_os_global_operations_imp.cpp} (94%)
 rename level_zero/sysman/source/global_operations/windows/{os_global_operations_imp.h => sysman_os_global_operations_imp.h} (89%)
 rename level_zero/sysman/source/linux/nl_api/{iaf_nl_api.cpp => sysman_iaf_nl_api.cpp} (99%)
 rename level_zero/sysman/source/linux/nl_api/{iaf_nl_api.h => sysman_iaf_nl_api.h} (98%)
 rename level_zero/sysman/source/linux/nl_api/{nl_api.cpp => sysman_nl_api.cpp} (99%)
 rename level_zero/sysman/source/linux/nl_api/{nl_api.h => sysman_nl_api.h} (100%)
 rename level_zero/sysman/source/linux/pmt/{pmt.cpp => sysman_pmt.cpp} (98%)
 rename level_zero/sysman/source/linux/pmt/{pmt.h => sysman_pmt.h} (97%)
 rename level_zero/sysman/source/linux/pmt/{pmt_helper.cpp => sysman_pmt_helper.cpp} (83%)
 rename level_zero/sysman/source/linux/pmt/{pmt_xml_offsets.h => sysman_pmt_xml_offsets.h} (100%)
 rename level_zero/sysman/source/linux/pmu/{pmu.h => sysman_pmu.h} (92%)
 rename level_zero/sysman/source/linux/pmu/{pmu_imp.cpp => sysman_pmu_imp.cpp} (98%)
 rename level_zero/sysman/source/linux/pmu/{pmu_imp.h => sysman_pmu_imp.h} (86%)
 rename level_zero/sysman/source/linux/{fs_access.cpp => sysman_fs_access.cpp} (99%)
 rename level_zero/sysman/source/linux/{fs_access.h => sysman_fs_access.h} (100%)
 rename level_zero/sysman/source/linux/{hw_device_id_linux.cpp => sysman_hw_device_id_linux.cpp} (94%)
 rename level_zero/sysman/source/linux/{hw_device_id_linux.h => sysman_hw_device_id_linux.h} (100%)
 rename level_zero/sysman/source/linux/{os_sysman_imp.cpp => zes_os_sysman_imp.cpp} (98%)
 rename level_zero/sysman/source/linux/{os_sysman_imp.h => zes_os_sysman_imp.h} (97%)
 rename level_zero/sysman/source/memory/linux/{os_memory_imp.cpp => sysman_os_memory_imp.cpp} (92%)
 rename level_zero/sysman/source/memory/linux/{os_memory_imp.h => sysman_os_memory_imp.h} (94%)
 rename level_zero/sysman/source/memory/linux/{os_memory_imp_dg1.cpp => sysman_os_memory_imp_dg1.cpp} (95%)
 rename level_zero/sysman/source/memory/linux/{os_memory_imp_prelim.cpp => sysman_os_memory_imp_prelim.cpp} (98%)
 rename level_zero/sysman/source/memory/linux/{os_memory_imp_prelim.h => sysman_os_memory_imp_prelim.h} (90%)
 rename level_zero/sysman/source/memory/{memory.cpp => sysman_memory.cpp} (96%)
 rename level_zero/sysman/source/memory/{memory.h => sysman_memory.h} (100%)
 rename level_zero/sysman/source/memory/{memory_imp.cpp => sysman_memory_imp.cpp} (94%)
 rename level_zero/sysman/source/memory/{memory_imp.h => sysman_memory_imp.h} (88%)
 rename level_zero/sysman/source/memory/{os_memory.h => sysman_os_memory.h} (100%)
 rename level_zero/sysman/source/memory/windows/{os_memory_imp.cpp => sysman_os_memory_imp.cpp} (85%)
 rename level_zero/sysman/source/memory/windows/{os_memory_imp.h => sysman_os_memory_imp.h} (93%)
 rename level_zero/sysman/source/pci/linux/{os_pci_imp.cpp => sysman_os_pci_imp.cpp} (98%)
 rename level_zero/sysman/source/pci/linux/{os_pci_imp.h => sysman_os_pci_imp.h} (97%)
 rename level_zero/sysman/source/pci/{os_pci.h => sysman_os_pci.h} (100%)
 rename level_zero/sysman/source/pci/{pci.h => sysman_pci.h} (100%)
 rename level_zero/sysman/source/pci/{pci_imp.cpp => sysman_pci_imp.cpp} (98%)
 rename level_zero/sysman/source/pci/{pci_imp.h => sysman_pci_imp.h} (95%)
 rename level_zero/sysman/source/pci/windows/{os_pci_imp.cpp => sysman_os_pci_imp.cpp} (94%)
 rename level_zero/sysman/source/pci/windows/{os_pci_imp.h => sysman_os_pci_imp.h} (94%)
 rename level_zero/sysman/source/performance/linux/{os_performance_imp.cpp => sysman_os_performance_imp.cpp} (92%)
 rename level_zero/sysman/source/performance/linux/{os_performance_imp.h => sysman_os_performance_imp.h} (80%)
 rename level_zero/sysman/source/performance/linux/{os_performance_imp_prelim.cpp => sysman_os_performance_imp_prelim.cpp} (99%)
 rename level_zero/sysman/source/performance/linux/{os_performance_imp_prelim.h => sysman_os_performance_imp_prelim.h} (87%)
 rename level_zero/sysman/source/performance/{os_performance.h => sysman_os_performance.h} (100%)
 rename level_zero/sysman/source/performance/{performance.cpp => sysman_performance.cpp} (93%)
 rename level_zero/sysman/source/performance/{performance.h => sysman_performance.h} (100%)
 rename level_zero/sysman/source/performance/{performance_imp.cpp => sysman_performance_imp.cpp} (95%)
 rename level_zero/sysman/source/performance/{performance_imp.h => sysman_performance_imp.h} (86%)
 rename level_zero/sysman/source/performance/windows/{os_performance_imp.cpp => sysman_os_performance_imp.cpp} (93%)
 rename level_zero/sysman/source/performance/windows/{os_performance_imp.h => sysman_os_performance_imp.h} (84%)
 rename level_zero/sysman/source/power/linux/{os_power_imp.cpp => sysman_os_power_imp.cpp} (98%)
 rename level_zero/sysman/source/power/linux/{os_power_imp.h => sysman_os_power_imp.h} (97%)
 rename level_zero/sysman/source/power/linux/{os_power_imp_prelim.cpp => sysman_os_power_imp_prelim.cpp} (98%)
 rename level_zero/sysman/source/power/linux/{os_power_imp_prelim.h => sysman_os_power_imp_prelim.h} (97%)
 rename level_zero/sysman/source/power/{os_power.h => sysman_os_power.h} (100%)
 rename level_zero/sysman/source/power/{power.cpp => sysman_power.cpp} (94%)
 rename level_zero/sysman/source/power/{power.h => sysman_power.h} (100%)
 rename level_zero/sysman/source/power/{power_imp.cpp => sysman_power_imp.cpp} (95%)
 rename level_zero/sysman/source/power/{power_imp.h => sysman_power_imp.h} (96%)
 rename level_zero/sysman/source/power/windows/{os_power_imp.cpp => sysman_os_power_imp.cpp} (98%)
 rename level_zero/sysman/source/power/windows/{os_power_imp.h => sysman_os_power_imp.h} (96%)
 rename level_zero/sysman/source/ras/linux/{os_ras_imp.cpp => sysman_os_ras_imp.cpp} (93%)
 rename level_zero/sysman/source/ras/linux/{os_ras_imp.h => sysman_os_ras_imp.h} (90%)
 rename level_zero/sysman/source/ras/linux/{os_ras_imp_gt.cpp => sysman_os_ras_imp_gt.cpp} (99%)
 rename level_zero/sysman/source/ras/linux/{os_ras_imp_hbm.cpp => sysman_os_ras_imp_hbm.cpp} (90%)
 rename level_zero/sysman/source/ras/linux/{os_ras_imp_prelim.cpp => sysman_os_ras_imp_prelim.cpp} (96%)
 rename level_zero/sysman/source/ras/linux/{os_ras_imp_prelim.h => sysman_os_ras_imp_prelim.h} (95%)
 rename level_zero/sysman/source/ras/{os_ras.h => sysman_os_ras.h} (100%)
 rename level_zero/sysman/source/ras/{ras.cpp => sysman_ras.cpp} (97%)
 rename level_zero/sysman/source/ras/{ras.h => sysman_ras.h} (100%)
 rename level_zero/sysman/source/ras/{ras_imp.cpp => sysman_ras_imp.cpp} (95%)
 rename level_zero/sysman/source/ras/{ras_imp.h => sysman_ras_imp.h} (88%)
 rename level_zero/sysman/source/ras/windows/{os_ras_imp.cpp => sysman_os_ras_imp.cpp} (96%)
 rename level_zero/sysman/source/scheduler/linux/{os_scheduler_imp.cpp => sysman_os_scheduler_imp.cpp} (98%)
 rename level_zero/sysman/source/scheduler/linux/{os_scheduler_imp.h => sysman_os_scheduler_imp.h} (95%)
 rename level_zero/sysman/source/scheduler/linux/{os_scheduler_imp_prelim.cpp => sysman_os_scheduler_imp_prelim.cpp} (99%)
 rename level_zero/sysman/source/scheduler/{os_scheduler.h => sysman_os_scheduler.h} (100%)
 rename level_zero/sysman/source/scheduler/{scheduler.cpp => sysman_scheduler.cpp} (97%)
 rename level_zero/sysman/source/scheduler/{scheduler.h => sysman_scheduler.h} (100%)
 rename level_zero/sysman/source/scheduler/{scheduler_imp.cpp => sysman_scheduler_imp.cpp} (96%)
 rename level_zero/sysman/source/scheduler/{scheduler_imp.h => sysman_scheduler_imp.h} (91%)
 rename level_zero/sysman/source/scheduler/windows/{os_scheduler_imp.cpp => sysman_os_scheduler_imp.cpp} (93%)
 rename level_zero/sysman/source/scheduler/windows/{os_scheduler_imp.h => sysman_os_scheduler_imp.h} (93%)
 rename level_zero/sysman/source/standby/linux/{os_standby_imp.cpp => sysman_os_standby_imp.cpp} (97%)
 rename level_zero/sysman/source/standby/linux/{os_standby_imp.h => sysman_os_standby_imp.h} (80%)
 rename level_zero/sysman/source/standby/{os_standby.h => sysman_os_standby.h} (100%)
 rename level_zero/sysman/source/standby/{standby.cpp => sysman_standby.cpp} (92%)
 rename level_zero/sysman/source/standby/{standby.h => sysman_standby.h} (100%)
 rename level_zero/sysman/source/standby/{standby_imp.cpp => sysman_standby_imp.cpp} (96%)
 rename level_zero/sysman/source/standby/{standby_imp.h => sysman_standby_imp.h} (87%)
 rename level_zero/sysman/source/standby/windows/{os_standby_imp.cpp => sysman_os_standby_imp.cpp} (94%)
 rename level_zero/sysman/source/temperature/linux/{os_temperature_imp.cpp => sysman_os_temperature_imp.cpp} (98%)
 rename level_zero/sysman/source/temperature/linux/{os_temperature_imp.h => sysman_os_temperature_imp.h} (88%)
 rename level_zero/sysman/source/temperature/{os_temperature.h => sysman_os_temperature.h} (100%)
 rename level_zero/sysman/source/temperature/{temperature.cpp => sysman_temperature.cpp} (96%)
 rename level_zero/sysman/source/temperature/{temperature.h => sysman_temperature.h} (100%)
 rename level_zero/sysman/source/temperature/{temperature_imp.cpp => sysman_temperature_imp.cpp} (94%)
 rename level_zero/sysman/source/temperature/{temperature_imp.h => sysman_temperature_imp.h} (86%)
 rename level_zero/sysman/source/temperature/windows/{os_temperature_imp.cpp => sysman_os_temperature_imp.cpp} (97%)
 rename level_zero/sysman/source/temperature/windows/{os_temperature_imp.h => sysman_os_temperature_imp.h} (86%)
 rename level_zero/sysman/source/windows/{hw_device_id_windows.cpp => sysman_hw_device_id_windows.cpp} (100%)
 rename level_zero/sysman/source/windows/{kmd_sys.h => sysman_kmd_sys.h} (100%)
 rename level_zero/sysman/source/windows/{kmd_sys_manager.cpp => sysman_kmd_sys_manager.cpp} (99%)
 rename level_zero/sysman/source/windows/{kmd_sys_manager.h => sysman_kmd_sys_manager.h} (95%)
 rename level_zero/sysman/source/windows/{os_sysman_imp.cpp => zes_os_sysman_imp.cpp} (92%)
 rename level_zero/sysman/source/windows/{os_sysman_imp.h => zes_os_sysman_imp.h} (88%)

diff --git a/level_zero/sysman/source/diagnostics/CMakeLists.txt b/level_zero/sysman/source/diagnostics/CMakeLists.txt
index 657dcdb80f..f18d5b74c0 100644
--- a/level_zero/sysman/source/diagnostics/CMakeLists.txt
+++ b/level_zero/sysman/source/diagnostics/CMakeLists.txt
@@ -7,8 +7,8 @@
 target_sources(${L0_STATIC_LIB_NAME}
                PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/diagnostics.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/diagnostics.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_diagnostics.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_diagnostics.cpp
 )
 
 add_subdirectories()
diff --git a/level_zero/sysman/source/diagnostics/diagnostics.cpp b/level_zero/sysman/source/diagnostics/sysman_diagnostics.cpp
similarity index 94%
rename from level_zero/sysman/source/diagnostics/diagnostics.cpp
rename to level_zero/sysman/source/diagnostics/sysman_diagnostics.cpp
index 9fd3ed8924..19bdcf5a49 100644
--- a/level_zero/sysman/source/diagnostics/diagnostics.cpp
+++ b/level_zero/sysman/source/diagnostics/sysman_diagnostics.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/diagnostics/diagnostics.h"
+#include "level_zero/sysman/source/diagnostics/sysman_diagnostics.h"
 
 #include "shared/source/helpers/basic_math.h"
 
diff --git a/level_zero/sysman/source/diagnostics/diagnostics.h b/level_zero/sysman/source/diagnostics/sysman_diagnostics.h
similarity index 100%
rename from level_zero/sysman/source/diagnostics/diagnostics.h
rename to level_zero/sysman/source/diagnostics/sysman_diagnostics.h
diff --git a/level_zero/sysman/source/ecc/CMakeLists.txt b/level_zero/sysman/source/ecc/CMakeLists.txt
index f68ef06be0..357cf6d55f 100644
--- a/level_zero/sysman/source/ecc/CMakeLists.txt
+++ b/level_zero/sysman/source/ecc/CMakeLists.txt
@@ -7,9 +7,9 @@
 target_sources(${L0_STATIC_LIB_NAME}
                PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/ecc.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/ecc_imp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/ecc_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_ecc.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_ecc_imp.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_ecc_imp.h
 )
 
 add_subdirectories()
diff --git a/level_zero/sysman/source/ecc/linux/CMakeLists.txt b/level_zero/sysman/source/ecc/linux/CMakeLists.txt
index 1d87991f53..4021362b27 100644
--- a/level_zero/sysman/source/ecc/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/ecc/linux/CMakeLists.txt
@@ -8,6 +8,6 @@ if(UNIX)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_ecc.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_ecc.cpp
   )
 endif()
diff --git a/level_zero/sysman/source/ecc/linux/os_ecc.cpp b/level_zero/sysman/source/ecc/linux/sysman_os_ecc.cpp
similarity index 77%
rename from level_zero/sysman/source/ecc/linux/os_ecc.cpp
rename to level_zero/sysman/source/ecc/linux/sysman_os_ecc.cpp
index 59b2c9d82a..55554fb61e 100644
--- a/level_zero/sysman/source/ecc/linux/os_ecc.cpp
+++ b/level_zero/sysman/source/ecc/linux/sysman_os_ecc.cpp
@@ -5,8 +5,8 @@
  *
  */
 
-#include "level_zero/sysman/source/ecc/ecc_imp.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/ecc/sysman_ecc_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/ecc/ecc.h b/level_zero/sysman/source/ecc/sysman_ecc.h
similarity index 100%
rename from level_zero/sysman/source/ecc/ecc.h
rename to level_zero/sysman/source/ecc/sysman_ecc.h
diff --git a/level_zero/sysman/source/ecc/ecc_imp.cpp b/level_zero/sysman/source/ecc/sysman_ecc_imp.cpp
similarity index 96%
rename from level_zero/sysman/source/ecc/ecc_imp.cpp
rename to level_zero/sysman/source/ecc/sysman_ecc_imp.cpp
index d0384c37b8..993f630dab 100644
--- a/level_zero/sysman/source/ecc/ecc_imp.cpp
+++ b/level_zero/sysman/source/ecc/sysman_ecc_imp.cpp
@@ -5,9 +5,9 @@
  *
  */
 
-#include "level_zero/sysman/source/ecc/ecc_imp.h"
+#include "level_zero/sysman/source/ecc/sysman_ecc_imp.h"
 
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/ecc/ecc_imp.h b/level_zero/sysman/source/ecc/sysman_ecc_imp.h
similarity index 95%
rename from level_zero/sysman/source/ecc/ecc_imp.h
rename to level_zero/sysman/source/ecc/sysman_ecc_imp.h
index 91662028af..6b67026f95 100644
--- a/level_zero/sysman/source/ecc/ecc_imp.h
+++ b/level_zero/sysman/source/ecc/sysman_ecc_imp.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/ecc/ecc.h"
+#include "level_zero/sysman/source/ecc/sysman_ecc.h"
 #include "level_zero/sysman/source/os_sysman.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/source/ecc/windows/CMakeLists.txt b/level_zero/sysman/source/ecc/windows/CMakeLists.txt
index db84959f2c..b22d6d12ea 100755
--- a/level_zero/sysman/source/ecc/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/ecc/windows/CMakeLists.txt
@@ -8,6 +8,6 @@ if(WIN32)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_ecc.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_ecc.cpp
   )
 endif()
diff --git a/level_zero/sysman/source/ecc/windows/os_ecc.cpp b/level_zero/sysman/source/ecc/windows/sysman_os_ecc.cpp
similarity index 70%
rename from level_zero/sysman/source/ecc/windows/os_ecc.cpp
rename to level_zero/sysman/source/ecc/windows/sysman_os_ecc.cpp
index b0fbfc5fd4..1583089b18 100644
--- a/level_zero/sysman/source/ecc/windows/os_ecc.cpp
+++ b/level_zero/sysman/source/ecc/windows/sysman_os_ecc.cpp
@@ -5,8 +5,8 @@
  *
  */
 
-#include "level_zero/sysman/source/ecc/ecc_imp.h"
-#include "level_zero/sysman/source/windows/os_sysman_imp.h"
+#include "level_zero/sysman/source/ecc/sysman_ecc_imp.h"
+#include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/engine/CMakeLists.txt b/level_zero/sysman/source/engine/CMakeLists.txt
index dfa18cc569..6804ce8c92 100755
--- a/level_zero/sysman/source/engine/CMakeLists.txt
+++ b/level_zero/sysman/source/engine/CMakeLists.txt
@@ -5,11 +5,11 @@
 #
 
 set(L0_SRCS_SYSMAN_ENGINE
-    ${CMAKE_CURRENT_SOURCE_DIR}/engine.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/engine.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/engine_imp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/engine_imp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_engine.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_engine.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_engine.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_engine_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_engine_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_engine.h
 )
 
 target_sources(${L0_STATIC_LIB_NAME}
diff --git a/level_zero/sysman/source/engine/linux/CMakeLists.txt b/level_zero/sysman/source/engine/linux/CMakeLists.txt
index ba5283d720..3812074614 100755
--- a/level_zero/sysman/source/engine/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/engine/linux/CMakeLists.txt
@@ -6,16 +6,16 @@
 
 set(L0_SRCS_SYSMAN_ENGINE_LINUX
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_engine_imp.h
 )
 
 if(NEO_ENABLE_i915_PRELIM_DETECTION)
   list(APPEND L0_SRCS_SYSMAN_ENGINE_LINUX
-       ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp_prelim.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_engine_imp_prelim.cpp
   )
 else()
   list(APPEND L0_SRCS_SYSMAN_ENGINE_LINUX
-       ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_engine_imp.cpp
   )
 endif()
 
diff --git a/level_zero/sysman/source/engine/linux/os_engine_imp.cpp b/level_zero/sysman/source/engine/linux/sysman_os_engine_imp.cpp
similarity index 95%
rename from level_zero/sysman/source/engine/linux/os_engine_imp.cpp
rename to level_zero/sysman/source/engine/linux/sysman_os_engine_imp.cpp
index 97b545a6e7..16bad36807 100644
--- a/level_zero/sysman/source/engine/linux/os_engine_imp.cpp
+++ b/level_zero/sysman/source/engine/linux/sysman_os_engine_imp.cpp
@@ -5,15 +5,15 @@
  *
  */
 
-#include "level_zero/sysman/source/engine/linux/os_engine_imp.h"
+#include "level_zero/sysman/source/engine/linux/sysman_os_engine_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915.h"
 
-#include "level_zero/sysman/source/linux/hw_device_id_linux.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/linux/pmu/pmu_imp.h"
+#include "level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h"
+#include "level_zero/sysman/source/linux/sysman_hw_device_id_linux.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/source/engine/linux/os_engine_imp.h b/level_zero/sysman/source/engine/linux/sysman_os_engine_imp.h
similarity index 95%
rename from level_zero/sysman/source/engine/linux/os_engine_imp.h
rename to level_zero/sysman/source/engine/linux/sysman_os_engine_imp.h
index acd832bb91..526ad431bd 100644
--- a/level_zero/sysman/source/engine/linux/os_engine_imp.h
+++ b/level_zero/sysman/source/engine/linux/sysman_os_engine_imp.h
@@ -9,7 +9,7 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 
-#include "level_zero/sysman/source/engine/os_engine.h"
+#include "level_zero/sysman/source/engine/sysman_os_engine.h"
 #include "level_zero/sysman/source/sysman_device_imp.h"
 
 #include <unistd.h>
diff --git a/level_zero/sysman/source/engine/linux/os_engine_imp_prelim.cpp b/level_zero/sysman/source/engine/linux/sysman_os_engine_imp_prelim.cpp
similarity index 96%
rename from level_zero/sysman/source/engine/linux/os_engine_imp_prelim.cpp
rename to level_zero/sysman/source/engine/linux/sysman_os_engine_imp_prelim.cpp
index 0524a4fc6c..c1e487f1d7 100644
--- a/level_zero/sysman/source/engine/linux/os_engine_imp_prelim.cpp
+++ b/level_zero/sysman/source/engine/linux/sysman_os_engine_imp_prelim.cpp
@@ -9,10 +9,10 @@
 #include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915_prelim.h"
 
-#include "level_zero/sysman/source/engine/linux/os_engine_imp.h"
-#include "level_zero/sysman/source/linux/hw_device_id_linux.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/linux/pmu/pmu_imp.h"
+#include "level_zero/sysman/source/engine/linux/sysman_os_engine_imp.h"
+#include "level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h"
+#include "level_zero/sysman/source/linux/sysman_hw_device_id_linux.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/source/engine/engine.cpp b/level_zero/sysman/source/engine/sysman_engine.cpp
similarity index 94%
rename from level_zero/sysman/source/engine/engine.cpp
rename to level_zero/sysman/source/engine/sysman_engine.cpp
index a9c8fb09be..c4a5ff579a 100644
--- a/level_zero/sysman/source/engine/engine.cpp
+++ b/level_zero/sysman/source/engine/sysman_engine.cpp
@@ -5,11 +5,11 @@
  *
  */
 
-#include "level_zero/sysman/source/engine/engine.h"
+#include "level_zero/sysman/source/engine/sysman_engine.h"
 
 #include "shared/source/helpers/basic_math.h"
 
-#include "level_zero/sysman/source/engine/engine_imp.h"
+#include "level_zero/sysman/source/engine/sysman_engine_imp.h"
 #include "level_zero/sysman/source/os_sysman.h"
 #include "level_zero/sysman/source/sysman_device_imp.h"
 
diff --git a/level_zero/sysman/source/engine/engine.h b/level_zero/sysman/source/engine/sysman_engine.h
similarity index 100%
rename from level_zero/sysman/source/engine/engine.h
rename to level_zero/sysman/source/engine/sysman_engine.h
diff --git a/level_zero/sysman/source/engine/engine_imp.cpp b/level_zero/sysman/source/engine/sysman_engine_imp.cpp
similarity index 93%
rename from level_zero/sysman/source/engine/engine_imp.cpp
rename to level_zero/sysman/source/engine/sysman_engine_imp.cpp
index 04bc06bdd9..3c50005fb1 100644
--- a/level_zero/sysman/source/engine/engine_imp.cpp
+++ b/level_zero/sysman/source/engine/sysman_engine_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/engine/engine_imp.h"
+#include "level_zero/sysman/source/engine/sysman_engine_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/engine/engine_imp.h b/level_zero/sysman/source/engine/sysman_engine_imp.h
similarity index 87%
rename from level_zero/sysman/source/engine/engine_imp.h
rename to level_zero/sysman/source/engine/sysman_engine_imp.h
index 1b8a2892a0..ddc6261adf 100644
--- a/level_zero/sysman/source/engine/engine_imp.h
+++ b/level_zero/sysman/source/engine/sysman_engine_imp.h
@@ -9,8 +9,8 @@
 
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/engine/engine.h"
-#include "level_zero/sysman/source/engine/os_engine.h"
+#include "level_zero/sysman/source/engine/sysman_engine.h"
+#include "level_zero/sysman/source/engine/sysman_os_engine.h"
 #include <level_zero/zes_api.h>
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/engine/os_engine.h b/level_zero/sysman/source/engine/sysman_os_engine.h
similarity index 93%
rename from level_zero/sysman/source/engine/os_engine.h
rename to level_zero/sysman/source/engine/sysman_os_engine.h
index 6a0d0771bc..5c616ee1e8 100644
--- a/level_zero/sysman/source/engine/os_engine.h
+++ b/level_zero/sysman/source/engine/sysman_os_engine.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/engine/engine.h"
+#include "level_zero/sysman/source/engine/sysman_engine.h"
 #include <level_zero/zes_api.h>
 
 #include <set>
diff --git a/level_zero/sysman/source/engine/windows/CMakeLists.txt b/level_zero/sysman/source/engine/windows/CMakeLists.txt
index afae0739fd..74c93fa29d 100755
--- a/level_zero/sysman/source/engine/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/engine/windows/CMakeLists.txt
@@ -6,8 +6,8 @@
 
 set(L0_SRCS_SYSMAN_ENGINE_WINDOWS
     ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_engine_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_engine_imp.cpp
 )
 
 if(WIN32)
diff --git a/level_zero/sysman/source/engine/windows/os_engine_imp.cpp b/level_zero/sysman/source/engine/windows/sysman_os_engine_imp.cpp
similarity index 94%
rename from level_zero/sysman/source/engine/windows/os_engine_imp.cpp
rename to level_zero/sysman/source/engine/windows/sysman_os_engine_imp.cpp
index e0935adcf2..6acee599cb 100644
--- a/level_zero/sysman/source/engine/windows/os_engine_imp.cpp
+++ b/level_zero/sysman/source/engine/windows/sysman_os_engine_imp.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "level_zero/sysman/source/engine/windows/os_engine_imp.h"
+#include "level_zero/sysman/source/engine/windows/sysman_os_engine_imp.h"
 
-#include "level_zero/sysman/source/windows/kmd_sys.h"
-#include "level_zero/sysman/source/windows/kmd_sys_manager.h"
+#include "level_zero/sysman/source/windows/sysman_kmd_sys.h"
+#include "level_zero/sysman/source/windows/sysman_kmd_sys_manager.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/engine/windows/os_engine_imp.h b/level_zero/sysman/source/engine/windows/sysman_os_engine_imp.h
similarity index 86%
rename from level_zero/sysman/source/engine/windows/os_engine_imp.h
rename to level_zero/sysman/source/engine/windows/sysman_os_engine_imp.h
index ed997c0c7f..5890fbbb0d 100644
--- a/level_zero/sysman/source/engine/windows/os_engine_imp.h
+++ b/level_zero/sysman/source/engine/windows/sysman_os_engine_imp.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/engine/os_engine.h"
-#include "level_zero/sysman/source/windows/os_sysman_imp.h"
+#include "level_zero/sysman/source/engine/sysman_os_engine.h"
+#include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/fabric_port/CMakeLists.txt b/level_zero/sysman/source/fabric_port/CMakeLists.txt
index fabdda7679..ec515f14bb 100644
--- a/level_zero/sysman/source/fabric_port/CMakeLists.txt
+++ b/level_zero/sysman/source/fabric_port/CMakeLists.txt
@@ -7,11 +7,11 @@
 target_sources(${L0_STATIC_LIB_NAME}
                PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/fabric_port.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/fabric_port.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/fabric_port_imp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/fabric_port_imp.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_fabric_port.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_fabric_port.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_fabric_port_imp.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_fabric_port_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_fabric_port.h
 )
 
 add_subdirectories()
diff --git a/level_zero/sysman/source/fabric_port/linux/CMakeLists.txt b/level_zero/sysman/source/fabric_port/linux/CMakeLists.txt
index f2d7899624..113a781af2 100644
--- a/level_zero/sysman/source/fabric_port/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/fabric_port/linux/CMakeLists.txt
@@ -13,29 +13,29 @@ if(UNIX)
   if(NEO_ENABLE_i915_PRELIM_DETECTION)
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp_prelim.cpp
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp_prelim.h
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_fabric_port_imp_prelim.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_fabric_port_imp_prelim.h
     )
 
     if(LIBGENL_FOUND)
       target_sources(${L0_STATIC_LIB_NAME}
                      PRIVATE
-                     ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access.h
-                     ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access_imp.cpp
-                     ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access_imp.h
+                     ${CMAKE_CURRENT_SOURCE_DIR}/sysman_fabric_device_access.h
+                     ${CMAKE_CURRENT_SOURCE_DIR}/sysman_fabric_device_access_imp.cpp
+                     ${CMAKE_CURRENT_SOURCE_DIR}/sysman_fabric_device_access_imp.h
       )
     else()
       target_sources(${L0_STATIC_LIB_NAME}
                      PRIVATE
-                     ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access_stub.cpp
-                     ${CMAKE_CURRENT_SOURCE_DIR}/fabric_device_access_stub.h
+                     ${CMAKE_CURRENT_SOURCE_DIR}/sysman_fabric_device_access_stub.cpp
+                     ${CMAKE_CURRENT_SOURCE_DIR}/sysman_fabric_device_access_stub.h
       )
     endif()
   else()
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.cpp
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.h
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_fabric_port_imp.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_fabric_port_imp.h
     )
   endif()
 endif()
diff --git a/level_zero/sysman/source/fabric_port/linux/fabric_device_access.h b/level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access.h
similarity index 96%
rename from level_zero/sysman/source/fabric_port/linux/fabric_device_access.h
rename to level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access.h
index 05a68bb47f..6abdc6306f 100644
--- a/level_zero/sysman/source/fabric_port/linux/fabric_device_access.h
+++ b/level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/linux/fs_access.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
 #include "level_zero/zes_api.h"
 
 #include <vector>
diff --git a/level_zero/sysman/source/fabric_port/linux/fabric_device_access_imp.cpp b/level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_imp.cpp
similarity index 98%
rename from level_zero/sysman/source/fabric_port/linux/fabric_device_access_imp.cpp
rename to level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_imp.cpp
index 821b18b54e..a29d15ccf4 100644
--- a/level_zero/sysman/source/fabric_port/linux/fabric_device_access_imp.cpp
+++ b/level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_imp.cpp
@@ -5,9 +5,9 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/linux/fabric_device_access_imp.h"
+#include "level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_imp.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 #include <limits>
 
diff --git a/level_zero/sysman/source/fabric_port/linux/fabric_device_access_imp.h b/level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_imp.h
similarity index 94%
rename from level_zero/sysman/source/fabric_port/linux/fabric_device_access_imp.h
rename to level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_imp.h
index 61f5ac6a04..23a21d139d 100644
--- a/level_zero/sysman/source/fabric_port/linux/fabric_device_access_imp.h
+++ b/level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_imp.h
@@ -7,9 +7,9 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/fabric_port/linux/fabric_device_access.h"
-#include "level_zero/sysman/source/linux/nl_api/iaf_nl_api.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access.h"
+#include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/fabric_port/linux/fabric_device_access_stub.cpp b/level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_stub.cpp
similarity index 94%
rename from level_zero/sysman/source/fabric_port/linux/fabric_device_access_stub.cpp
rename to level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_stub.cpp
index e4a6dbe509..726b5cb73c 100644
--- a/level_zero/sysman/source/fabric_port/linux/fabric_device_access_stub.cpp
+++ b/level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_stub.cpp
@@ -5,9 +5,9 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/linux/fabric_device_access_stub.h"
+#include "level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_stub.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/fabric_port/linux/fabric_device_access_stub.h b/level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_stub.h
similarity index 95%
rename from level_zero/sysman/source/fabric_port/linux/fabric_device_access_stub.h
rename to level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_stub.h
index 722939ef88..d38775937a 100644
--- a/level_zero/sysman/source/fabric_port/linux/fabric_device_access_stub.h
+++ b/level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_stub.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/fabric_port/linux/fabric_device_access.h"
+#include "level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp.cpp b/level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp.cpp
similarity index 96%
rename from level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp.cpp
rename to level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp.cpp
index d24d15a337..386c6e7bf3 100644
--- a/level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp.cpp
+++ b/level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp.h"
+#include "level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp.h"
 
 #include <cstdio>
 
diff --git a/level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp.h b/level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp.h
similarity index 87%
rename from level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp.h
rename to level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp.h
index 0a331fc144..4fcda7cfc6 100644
--- a/level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp.h
+++ b/level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp.h
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/fabric_port/fabric_port_imp.h"
-#include "level_zero/sysman/source/fabric_port/os_fabric_port.h"
-#include "level_zero/sysman/source/linux/fs_access.h"
+#include "level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.h"
+#include "level_zero/sysman/source/fabric_port/sysman_os_fabric_port.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp_prelim.cpp b/level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp_prelim.cpp
similarity index 98%
rename from level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp_prelim.cpp
rename to level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp_prelim.cpp
index f6ba425cf2..550b833672 100644
--- a/level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp_prelim.cpp
+++ b/level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp_prelim.cpp
@@ -5,12 +5,12 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp_prelim.h"
+#include "level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp_prelim.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/debug_helpers.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 #include <cstdio>
 
diff --git a/level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp_prelim.h b/level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp_prelim.h
similarity index 93%
rename from level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp_prelim.h
rename to level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp_prelim.h
index 1224eb2d68..08cbb9a75d 100644
--- a/level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp_prelim.h
+++ b/level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp_prelim.h
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/fabric_port/fabric_port_imp.h"
-#include "level_zero/sysman/source/fabric_port/linux/fabric_device_access.h"
-#include "level_zero/sysman/source/fabric_port/os_fabric_port.h"
+#include "level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access.h"
+#include "level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.h"
+#include "level_zero/sysman/source/fabric_port/sysman_os_fabric_port.h"
 
 #include <vector>
 
diff --git a/level_zero/sysman/source/fabric_port/fabric_port.cpp b/level_zero/sysman/source/fabric_port/sysman_fabric_port.cpp
similarity index 92%
rename from level_zero/sysman/source/fabric_port/fabric_port.cpp
rename to level_zero/sysman/source/fabric_port/sysman_fabric_port.cpp
index 731104aae8..9502c9e65a 100644
--- a/level_zero/sysman/source/fabric_port/fabric_port.cpp
+++ b/level_zero/sysman/source/fabric_port/sysman_fabric_port.cpp
@@ -5,12 +5,12 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/fabric_port.h"
+#include "level_zero/sysman/source/fabric_port/sysman_fabric_port.h"
 
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/helpers/debug_helpers.h"
 
-#include "level_zero/sysman/source/fabric_port/fabric_port_imp.h"
+#include "level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/fabric_port/fabric_port.h b/level_zero/sysman/source/fabric_port/sysman_fabric_port.h
similarity index 100%
rename from level_zero/sysman/source/fabric_port/fabric_port.h
rename to level_zero/sysman/source/fabric_port/sysman_fabric_port.h
diff --git a/level_zero/sysman/source/fabric_port/fabric_port_imp.cpp b/level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.cpp
similarity index 96%
rename from level_zero/sysman/source/fabric_port/fabric_port_imp.cpp
rename to level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.cpp
index 9490bcd2a1..613dcfc7b8 100644
--- a/level_zero/sysman/source/fabric_port/fabric_port_imp.cpp
+++ b/level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/fabric_port_imp.h"
+#include "level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 
diff --git a/level_zero/sysman/source/fabric_port/fabric_port_imp.h b/level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.h
similarity index 91%
rename from level_zero/sysman/source/fabric_port/fabric_port_imp.h
rename to level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.h
index 59fe2cebcc..4979b04434 100644
--- a/level_zero/sysman/source/fabric_port/fabric_port_imp.h
+++ b/level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.h
@@ -9,8 +9,8 @@
 
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/fabric_port/fabric_port.h"
-#include "level_zero/sysman/source/fabric_port/os_fabric_port.h"
+#include "level_zero/sysman/source/fabric_port/sysman_fabric_port.h"
+#include "level_zero/sysman/source/fabric_port/sysman_os_fabric_port.h"
 #include <level_zero/zes_api.h>
 
 namespace L0 {
diff --git a/level_zero/sysman/source/fabric_port/os_fabric_port.h b/level_zero/sysman/source/fabric_port/sysman_os_fabric_port.h
similarity index 100%
rename from level_zero/sysman/source/fabric_port/os_fabric_port.h
rename to level_zero/sysman/source/fabric_port/sysman_os_fabric_port.h
diff --git a/level_zero/sysman/source/fabric_port/windows/CMakeLists.txt b/level_zero/sysman/source/fabric_port/windows/CMakeLists.txt
index d4989479f3..fb0d88ed43 100644
--- a/level_zero/sysman/source/fabric_port/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/fabric_port/windows/CMakeLists.txt
@@ -8,7 +8,7 @@ if(WIN32)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_fabric_port_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_fabric_port_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_fabric_port_imp.h
   )
 endif()
diff --git a/level_zero/sysman/source/fabric_port/windows/os_fabric_port_imp.cpp b/level_zero/sysman/source/fabric_port/windows/sysman_os_fabric_port_imp.cpp
similarity index 96%
rename from level_zero/sysman/source/fabric_port/windows/os_fabric_port_imp.cpp
rename to level_zero/sysman/source/fabric_port/windows/sysman_os_fabric_port_imp.cpp
index 5b1efcd2ef..235414d189 100644
--- a/level_zero/sysman/source/fabric_port/windows/os_fabric_port_imp.cpp
+++ b/level_zero/sysman/source/fabric_port/windows/sysman_os_fabric_port_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/windows/os_fabric_port_imp.h"
+#include "level_zero/sysman/source/fabric_port/windows/sysman_os_fabric_port_imp.h"
 
 #include <cstring>
 
diff --git a/level_zero/sysman/source/fabric_port/windows/os_fabric_port_imp.h b/level_zero/sysman/source/fabric_port/windows/sysman_os_fabric_port_imp.h
similarity index 89%
rename from level_zero/sysman/source/fabric_port/windows/os_fabric_port_imp.h
rename to level_zero/sysman/source/fabric_port/windows/sysman_os_fabric_port_imp.h
index 04cafc09fe..4f91e6ecff 100644
--- a/level_zero/sysman/source/fabric_port/windows/os_fabric_port_imp.h
+++ b/level_zero/sysman/source/fabric_port/windows/sysman_os_fabric_port_imp.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/fabric_port/fabric_port_imp.h"
-#include "level_zero/sysman/source/fabric_port/os_fabric_port.h"
+#include "level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.h"
+#include "level_zero/sysman/source/fabric_port/sysman_os_fabric_port.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/firmware/CMakeLists.txt b/level_zero/sysman/source/firmware/CMakeLists.txt
index 1b1487d92d..8575ecb90a 100644
--- a/level_zero/sysman/source/firmware/CMakeLists.txt
+++ b/level_zero/sysman/source/firmware/CMakeLists.txt
@@ -7,11 +7,11 @@
 target_sources(${L0_STATIC_LIB_NAME}
                PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/firmware.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/firmware.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/firmware_imp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/firmware_imp.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_firmware.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_firmware.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_firmware_imp.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_firmware_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_firmware.h
 )
 
 add_subdirectories()
diff --git a/level_zero/sysman/source/firmware/linux/CMakeLists.txt b/level_zero/sysman/source/firmware/linux/CMakeLists.txt
index eca5c7bd62..3603a20340 100644
--- a/level_zero/sysman/source/firmware/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/firmware/linux/CMakeLists.txt
@@ -8,19 +8,19 @@ if(UNIX)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_firmware_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_firmware_imp.h
   )
 
   if(NEO_ENABLE_i915_PRELIM_DETECTION)
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp_helper_prelim.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_firmware_imp_helper_prelim.cpp
     )
   else()
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp_helper.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_firmware_imp_helper.cpp
     )
   endif()
 endif()
diff --git a/level_zero/sysman/source/firmware/linux/os_firmware_imp.cpp b/level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.cpp
similarity index 92%
rename from level_zero/sysman/source/firmware/linux/os_firmware_imp.cpp
rename to level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.cpp
index e716932a27..5ec035bff8 100644
--- a/level_zero/sysman/source/firmware/linux/os_firmware_imp.cpp
+++ b/level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.cpp
@@ -5,12 +5,12 @@
  *
  */
 
-#include "level_zero/sysman/source/firmware/linux/os_firmware_imp.h"
+#include "level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.h"
 
 #include "shared/source/helpers/string.h"
 
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
-#include "level_zero/sysman/source/linux/fs_access.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 #include <algorithm>
diff --git a/level_zero/sysman/source/firmware/linux/os_firmware_imp.h b/level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.h
similarity index 81%
rename from level_zero/sysman/source/firmware/linux/os_firmware_imp.h
rename to level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.h
index be9c147da8..76e563bfdb 100644
--- a/level_zero/sysman/source/firmware/linux/os_firmware_imp.h
+++ b/level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.h
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/firmware/firmware_imp.h"
-#include "level_zero/sysman/source/firmware/os_firmware.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/firmware/sysman_firmware_imp.h"
+#include "level_zero/sysman/source/firmware/sysman_os_firmware.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/firmware/linux/os_firmware_imp_helper.cpp b/level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp_helper.cpp
similarity index 79%
rename from level_zero/sysman/source/firmware/linux/os_firmware_imp_helper.cpp
rename to level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp_helper.cpp
index 1aec12553c..65bdbbdd10 100644
--- a/level_zero/sysman/source/firmware/linux/os_firmware_imp_helper.cpp
+++ b/level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp_helper.cpp
@@ -5,8 +5,8 @@
  *
  */
 
-#include "level_zero/sysman/source/firmware/linux/os_firmware_imp.h"
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
+#include "level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/firmware/linux/os_firmware_imp_helper_prelim.cpp b/level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp_helper_prelim.cpp
similarity index 90%
rename from level_zero/sysman/source/firmware/linux/os_firmware_imp_helper_prelim.cpp
rename to level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp_helper_prelim.cpp
index b1ab9414ec..9515369e18 100644
--- a/level_zero/sysman/source/firmware/linux/os_firmware_imp_helper_prelim.cpp
+++ b/level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp_helper_prelim.cpp
@@ -5,9 +5,9 @@
  *
  */
 
-#include "level_zero/sysman/source/firmware/linux/os_firmware_imp.h"
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
-#include "level_zero/sysman/source/linux/fs_access.h"
+#include "level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
 
 const std::string iafPath = "device/";
 const std::string iafDirectory = "iaf.";
diff --git a/level_zero/sysman/source/firmware/firmware.cpp b/level_zero/sysman/source/firmware/sysman_firmware.cpp
similarity index 95%
rename from level_zero/sysman/source/firmware/firmware.cpp
rename to level_zero/sysman/source/firmware/sysman_firmware.cpp
index 1f15490baf..52135f56ba 100644
--- a/level_zero/sysman/source/firmware/firmware.cpp
+++ b/level_zero/sysman/source/firmware/sysman_firmware.cpp
@@ -7,7 +7,7 @@
 
 #include "shared/source/helpers/basic_math.h"
 
-#include "level_zero/sysman/source/firmware/firmware_imp.h"
+#include "level_zero/sysman/source/firmware/sysman_firmware_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/firmware/firmware.h b/level_zero/sysman/source/firmware/sysman_firmware.h
similarity index 100%
rename from level_zero/sysman/source/firmware/firmware.h
rename to level_zero/sysman/source/firmware/sysman_firmware.h
diff --git a/level_zero/sysman/source/firmware/firmware_imp.cpp b/level_zero/sysman/source/firmware/sysman_firmware_imp.cpp
similarity index 87%
rename from level_zero/sysman/source/firmware/firmware_imp.cpp
rename to level_zero/sysman/source/firmware/sysman_firmware_imp.cpp
index 1b3178a230..75f57954ef 100644
--- a/level_zero/sysman/source/firmware/firmware_imp.cpp
+++ b/level_zero/sysman/source/firmware/sysman_firmware_imp.cpp
@@ -5,11 +5,11 @@
  *
  */
 
-#include "level_zero/sysman/source/firmware/firmware_imp.h"
+#include "level_zero/sysman/source/firmware/sysman_firmware_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 
-#include "level_zero/sysman/source/firmware/os_firmware.h"
+#include "level_zero/sysman/source/firmware/sysman_os_firmware.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/firmware/firmware_imp.h b/level_zero/sysman/source/firmware/sysman_firmware_imp.h
similarity index 86%
rename from level_zero/sysman/source/firmware/firmware_imp.h
rename to level_zero/sysman/source/firmware/sysman_firmware_imp.h
index 3a819ab4ff..d3214534df 100644
--- a/level_zero/sysman/source/firmware/firmware_imp.h
+++ b/level_zero/sysman/source/firmware/sysman_firmware_imp.h
@@ -9,8 +9,8 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/helpers/string.h"
 
-#include "level_zero/sysman/source/firmware/firmware.h"
-#include "level_zero/sysman/source/firmware/os_firmware.h"
+#include "level_zero/sysman/source/firmware/sysman_firmware.h"
+#include "level_zero/sysman/source/firmware/sysman_os_firmware.h"
 #include <level_zero/zes_api.h>
 
 namespace L0 {
diff --git a/level_zero/sysman/source/firmware/os_firmware.h b/level_zero/sysman/source/firmware/sysman_os_firmware.h
similarity index 100%
rename from level_zero/sysman/source/firmware/os_firmware.h
rename to level_zero/sysman/source/firmware/sysman_os_firmware.h
diff --git a/level_zero/sysman/source/firmware/windows/CMakeLists.txt b/level_zero/sysman/source/firmware/windows/CMakeLists.txt
index 3f522bdf49..f9e90645fa 100644
--- a/level_zero/sysman/source/firmware/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/firmware/windows/CMakeLists.txt
@@ -8,7 +8,7 @@ if(WIN32)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_firmware_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_firmware_imp.h
   )
 endif()
diff --git a/level_zero/sysman/source/firmware/windows/os_firmware_imp.cpp b/level_zero/sysman/source/firmware/windows/sysman_os_firmware_imp.cpp
similarity index 83%
rename from level_zero/sysman/source/firmware/windows/os_firmware_imp.cpp
rename to level_zero/sysman/source/firmware/windows/sysman_os_firmware_imp.cpp
index 856aa38d62..4873f2ce69 100644
--- a/level_zero/sysman/source/firmware/windows/os_firmware_imp.cpp
+++ b/level_zero/sysman/source/firmware/windows/sysman_os_firmware_imp.cpp
@@ -5,9 +5,9 @@
  *
  */
 
-#include "level_zero/sysman/source/firmware/windows/os_firmware_imp.h"
+#include "level_zero/sysman/source/firmware/windows/sysman_os_firmware_imp.h"
 
-#include "level_zero/sysman/source/windows/os_sysman_imp.h"
+#include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/firmware/windows/os_firmware_imp.h b/level_zero/sysman/source/firmware/windows/sysman_os_firmware_imp.h
similarity index 90%
rename from level_zero/sysman/source/firmware/windows/os_firmware_imp.h
rename to level_zero/sysman/source/firmware/windows/sysman_os_firmware_imp.h
index b87101fb0c..3f7e3aec65 100644
--- a/level_zero/sysman/source/firmware/windows/os_firmware_imp.h
+++ b/level_zero/sysman/source/firmware/windows/sysman_os_firmware_imp.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/firmware/os_firmware.h"
+#include "level_zero/sysman/source/firmware/sysman_os_firmware.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/firmware_util/CMakeLists.txt b/level_zero/sysman/source/firmware_util/CMakeLists.txt
index 01775d3508..e8a5710aa4 100644
--- a/level_zero/sysman/source/firmware_util/CMakeLists.txt
+++ b/level_zero/sysman/source/firmware_util/CMakeLists.txt
@@ -8,20 +8,20 @@ if(igsc_FOUND)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/igsc_wrapper.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp_helper.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_firmware_util_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_firmware_util_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_firmware_util.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_igsc_wrapper.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_firmware_util_imp_helper.cpp
   )
   add_subdirectories()
 else()
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util_imp_stub.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/firmware_util.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/igsc_wrapper.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_firmware_util_imp_stub.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_firmware_util.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_igsc_wrapper.h
   )
 endif()
 
diff --git a/level_zero/sysman/source/firmware_util/linux/CMakeLists.txt b/level_zero/sysman/source/firmware_util/linux/CMakeLists.txt
index 4bc66fe3b8..74d28ec5b6 100644
--- a/level_zero/sysman/source/firmware_util/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/firmware_util/linux/CMakeLists.txt
@@ -8,6 +8,6 @@ if(UNIX)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_util_enumeration.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_firmware_util_enumeration.cpp
   )
 endif()
diff --git a/level_zero/sysman/source/firmware_util/linux/os_firmware_util_enumeration.cpp b/level_zero/sysman/source/firmware_util/linux/sysman_os_firmware_util_enumeration.cpp
similarity index 74%
rename from level_zero/sysman/source/firmware_util/linux/os_firmware_util_enumeration.cpp
rename to level_zero/sysman/source/firmware_util/linux/sysman_os_firmware_util_enumeration.cpp
index a82fbd44ee..70a3a9a46a 100644
--- a/level_zero/sysman/source/firmware_util/linux/os_firmware_util_enumeration.cpp
+++ b/level_zero/sysman/source/firmware_util/linux/sysman_os_firmware_util_enumeration.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/firmware_util/firmware_util_imp.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/firmware_util/firmware_util.h b/level_zero/sysman/source/firmware_util/sysman_firmware_util.h
similarity index 95%
rename from level_zero/sysman/source/firmware_util/firmware_util.h
rename to level_zero/sysman/source/firmware_util/sysman_firmware_util.h
index 10509adf44..721c379b45 100644
--- a/level_zero/sysman/source/firmware_util/firmware_util.h
+++ b/level_zero/sysman/source/firmware_util/sysman_firmware_util.h
@@ -9,7 +9,7 @@
 
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/firmware_util/igsc_wrapper.h"
+#include "level_zero/sysman/source/firmware_util/sysman_igsc_wrapper.h"
 #include <level_zero/zes_api.h>
 
 #include <string>
diff --git a/level_zero/sysman/source/firmware_util/firmware_util_imp.cpp b/level_zero/sysman/source/firmware_util/sysman_firmware_util_imp.cpp
similarity index 99%
rename from level_zero/sysman/source/firmware_util/firmware_util_imp.cpp
rename to level_zero/sysman/source/firmware_util/sysman_firmware_util_imp.cpp
index a5a26da02f..91a19baf14 100644
--- a/level_zero/sysman/source/firmware_util/firmware_util_imp.cpp
+++ b/level_zero/sysman/source/firmware_util/sysman_firmware_util_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/firmware_util/firmware_util_imp.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/debug_helpers.h"
diff --git a/level_zero/sysman/source/firmware_util/firmware_util_imp.h b/level_zero/sysman/source/firmware_util/sysman_firmware_util_imp.h
similarity index 99%
rename from level_zero/sysman/source/firmware_util/firmware_util_imp.h
rename to level_zero/sysman/source/firmware_util/sysman_firmware_util_imp.h
index 486e1fcd2e..f80915c512 100644
--- a/level_zero/sysman/source/firmware_util/firmware_util_imp.h
+++ b/level_zero/sysman/source/firmware_util/sysman_firmware_util_imp.h
@@ -10,7 +10,7 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/os_library.h"
 
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
 
 #include <cinttypes>
 #include <mutex>
diff --git a/level_zero/sysman/source/firmware_util/firmware_util_imp_helper.cpp b/level_zero/sysman/source/firmware_util/sysman_firmware_util_imp_helper.cpp
similarity index 99%
rename from level_zero/sysman/source/firmware_util/firmware_util_imp_helper.cpp
rename to level_zero/sysman/source/firmware_util/sysman_firmware_util_imp_helper.cpp
index 477817f7a7..f2adde3de9 100644
--- a/level_zero/sysman/source/firmware_util/firmware_util_imp_helper.cpp
+++ b/level_zero/sysman/source/firmware_util/sysman_firmware_util_imp_helper.cpp
@@ -7,7 +7,7 @@
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
-#include "level_zero/sysman/source/firmware_util/firmware_util_imp.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util_imp.h"
 
 static std::vector<std ::string> deviceSupportedFirmwareTypes = {"GSC", "OptionROM", "PSC"};
 
diff --git a/level_zero/sysman/source/firmware_util/firmware_util_imp_stub.cpp b/level_zero/sysman/source/firmware_util/sysman_firmware_util_imp_stub.cpp
similarity index 79%
rename from level_zero/sysman/source/firmware_util/firmware_util_imp_stub.cpp
rename to level_zero/sysman/source/firmware_util/sysman_firmware_util_imp_stub.cpp
index 4483a4affd..8315cfa6da 100644
--- a/level_zero/sysman/source/firmware_util/firmware_util_imp_stub.cpp
+++ b/level_zero/sysman/source/firmware_util/sysman_firmware_util_imp_stub.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
 namespace L0 {
 namespace Sysman {
 FirmwareUtil *FirmwareUtil::create(uint16_t domain, uint8_t bus, uint8_t device, uint8_t function) {
diff --git a/level_zero/sysman/source/firmware_util/igsc_wrapper.h b/level_zero/sysman/source/firmware_util/sysman_igsc_wrapper.h
similarity index 100%
rename from level_zero/sysman/source/firmware_util/igsc_wrapper.h
rename to level_zero/sysman/source/firmware_util/sysman_igsc_wrapper.h
diff --git a/level_zero/sysman/source/firmware_util/windows/CMakeLists.txt b/level_zero/sysman/source/firmware_util/windows/CMakeLists.txt
index 57d7234e47..5854af58de 100644
--- a/level_zero/sysman/source/firmware_util/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/firmware_util/windows/CMakeLists.txt
@@ -8,6 +8,6 @@ if(WIN32)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_firmware_util_enumeration.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_firmware_util_enumeration.cpp
   )
 endif()
diff --git a/level_zero/sysman/source/firmware_util/windows/os_firmware_util_enumeration.cpp b/level_zero/sysman/source/firmware_util/windows/sysman_os_firmware_util_enumeration.cpp
similarity index 74%
rename from level_zero/sysman/source/firmware_util/windows/os_firmware_util_enumeration.cpp
rename to level_zero/sysman/source/firmware_util/windows/sysman_os_firmware_util_enumeration.cpp
index a467c6c39d..6ef8a257e6 100644
--- a/level_zero/sysman/source/firmware_util/windows/os_firmware_util_enumeration.cpp
+++ b/level_zero/sysman/source/firmware_util/windows/sysman_os_firmware_util_enumeration.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/firmware_util/firmware_util_imp.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/frequency/CMakeLists.txt b/level_zero/sysman/source/frequency/CMakeLists.txt
index 2ee29a15ea..699a7205a0 100644
--- a/level_zero/sysman/source/frequency/CMakeLists.txt
+++ b/level_zero/sysman/source/frequency/CMakeLists.txt
@@ -5,11 +5,11 @@
 #
 
 set(L0_SRCS_SYSMAN_FREQUENCY
-    ${CMAKE_CURRENT_SOURCE_DIR}/frequency.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/frequency.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/frequency_imp.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/frequency_imp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_frequency.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_frequency.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_frequency_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_frequency_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_frequency.h
 )
 
 target_sources(${L0_STATIC_LIB_NAME}
diff --git a/level_zero/sysman/source/frequency/linux/CMakeLists.txt b/level_zero/sysman/source/frequency/linux/CMakeLists.txt
index a2497759ce..7401b8c91b 100644
--- a/level_zero/sysman/source/frequency/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/frequency/linux/CMakeLists.txt
@@ -10,13 +10,13 @@ set(L0_SRCS_SYSMAN_FREQUENCY_LINUX
 
 if(NEO_ENABLE_i915_PRELIM_DETECTION)
   list(APPEND L0_SRCS_SYSMAN_FREQUENCY_LINUX
-       ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp_prelim.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp_prelim.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_frequency_imp_prelim.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_frequency_imp_prelim.h
   )
 else()
   list(APPEND L0_SRCS_SYSMAN_FREQUENCY_LINUX
-       ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp.cpp
-       ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp.h
+       ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_frequency_imp.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_frequency_imp.h
   )
 endif()
 
diff --git a/level_zero/sysman/source/frequency/linux/os_frequency_imp.cpp b/level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp.cpp
similarity index 99%
rename from level_zero/sysman/source/frequency/linux/os_frequency_imp.cpp
rename to level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp.cpp
index 63ab89efbe..a081425eb5 100644
--- a/level_zero/sysman/source/frequency/linux/os_frequency_imp.cpp
+++ b/level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp.cpp
@@ -5,11 +5,11 @@
  *
  */
 
-#include "level_zero/sysman/source/frequency/linux/os_frequency_imp.h"
+#include "level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 #include <cmath>
 
diff --git a/level_zero/sysman/source/frequency/linux/os_frequency_imp.h b/level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp.h
similarity index 93%
rename from level_zero/sysman/source/frequency/linux/os_frequency_imp.h
rename to level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp.h
index 928c1c39ef..0d7df48bbe 100644
--- a/level_zero/sysman/source/frequency/linux/os_frequency_imp.h
+++ b/level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp.h
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/frequency/frequency_imp.h"
-#include "level_zero/sysman/source/frequency/os_frequency.h"
-#include "level_zero/sysman/source/linux/fs_access.h"
+#include "level_zero/sysman/source/frequency/sysman_frequency_imp.h"
+#include "level_zero/sysman/source/frequency/sysman_os_frequency.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/frequency/linux/os_frequency_imp_prelim.cpp b/level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp_prelim.cpp
similarity index 99%
rename from level_zero/sysman/source/frequency/linux/os_frequency_imp_prelim.cpp
rename to level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp_prelim.cpp
index 8c2f2a056b..7622c3d0da 100644
--- a/level_zero/sysman/source/frequency/linux/os_frequency_imp_prelim.cpp
+++ b/level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp_prelim.cpp
@@ -5,13 +5,13 @@
  *
  */
 
-#include "level_zero/sysman/source/frequency/linux/os_frequency_imp_prelim.h"
+#include "level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp_prelim.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
 #include "shared/source/helpers/hw_info.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 #include <cmath>
 
diff --git a/level_zero/sysman/source/frequency/linux/os_frequency_imp_prelim.h b/level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp_prelim.h
similarity index 93%
rename from level_zero/sysman/source/frequency/linux/os_frequency_imp_prelim.h
rename to level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp_prelim.h
index 8011dc381e..9dad31cc91 100644
--- a/level_zero/sysman/source/frequency/linux/os_frequency_imp_prelim.h
+++ b/level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp_prelim.h
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/frequency/frequency_imp.h"
-#include "level_zero/sysman/source/frequency/os_frequency.h"
-#include "level_zero/sysman/source/linux/fs_access.h"
+#include "level_zero/sysman/source/frequency/sysman_frequency_imp.h"
+#include "level_zero/sysman/source/frequency/sysman_os_frequency.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
 
 #include "igfxfmid.h"
 namespace L0 {
diff --git a/level_zero/sysman/source/frequency/frequency.cpp b/level_zero/sysman/source/frequency/sysman_frequency.cpp
similarity index 91%
rename from level_zero/sysman/source/frequency/frequency.cpp
rename to level_zero/sysman/source/frequency/sysman_frequency.cpp
index 51cc1a596b..ec673d2030 100644
--- a/level_zero/sysman/source/frequency/frequency.cpp
+++ b/level_zero/sysman/source/frequency/sysman_frequency.cpp
@@ -5,12 +5,12 @@
  *
  */
 
-#include "level_zero/sysman/source/frequency/frequency.h"
+#include "level_zero/sysman/source/frequency/sysman_frequency.h"
 
 #include "shared/source/helpers/basic_math.h"
 
-#include "level_zero/sysman/source/frequency/frequency_imp.h"
-#include "level_zero/sysman/source/frequency/os_frequency.h"
+#include "level_zero/sysman/source/frequency/sysman_frequency_imp.h"
+#include "level_zero/sysman/source/frequency/sysman_os_frequency.h"
 #include "level_zero/sysman/source/os_sysman.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/source/frequency/frequency.h b/level_zero/sysman/source/frequency/sysman_frequency.h
similarity index 100%
rename from level_zero/sysman/source/frequency/frequency.h
rename to level_zero/sysman/source/frequency/sysman_frequency.h
diff --git a/level_zero/sysman/source/frequency/frequency_imp.cpp b/level_zero/sysman/source/frequency/sysman_frequency_imp.cpp
similarity index 98%
rename from level_zero/sysman/source/frequency/frequency_imp.cpp
rename to level_zero/sysman/source/frequency/sysman_frequency_imp.cpp
index 9124d79c1a..158e8886eb 100644
--- a/level_zero/sysman/source/frequency/frequency_imp.cpp
+++ b/level_zero/sysman/source/frequency/sysman_frequency_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/frequency/frequency_imp.h"
+#include "level_zero/sysman/source/frequency/sysman_frequency_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 
diff --git a/level_zero/sysman/source/frequency/frequency_imp.h b/level_zero/sysman/source/frequency/sysman_frequency_imp.h
similarity index 94%
rename from level_zero/sysman/source/frequency/frequency_imp.h
rename to level_zero/sysman/source/frequency/sysman_frequency_imp.h
index 9b8a640d61..26cb66cc57 100644
--- a/level_zero/sysman/source/frequency/frequency_imp.h
+++ b/level_zero/sysman/source/frequency/sysman_frequency_imp.h
@@ -9,8 +9,8 @@
 
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/frequency/frequency.h"
-#include "level_zero/sysman/source/frequency/os_frequency.h"
+#include "level_zero/sysman/source/frequency/sysman_frequency.h"
+#include "level_zero/sysman/source/frequency/sysman_os_frequency.h"
 #include <level_zero/zes_api.h>
 
 namespace L0 {
diff --git a/level_zero/sysman/source/frequency/os_frequency.h b/level_zero/sysman/source/frequency/sysman_os_frequency.h
similarity index 100%
rename from level_zero/sysman/source/frequency/os_frequency.h
rename to level_zero/sysman/source/frequency/sysman_os_frequency.h
diff --git a/level_zero/sysman/source/frequency/windows/CMakeLists.txt b/level_zero/sysman/source/frequency/windows/CMakeLists.txt
index 20c04b67bb..70e9fb5657 100644
--- a/level_zero/sysman/source/frequency/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/frequency/windows/CMakeLists.txt
@@ -5,8 +5,8 @@
 #
 
 set(L0_SRCS_SYSMAN_FREQUENCY_WINDOWS
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/os_frequency_imp.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_frequency_imp.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_frequency_imp.cpp
 )
 
 if(WIN32)
diff --git a/level_zero/sysman/source/frequency/windows/os_frequency_imp.cpp b/level_zero/sysman/source/frequency/windows/sysman_os_frequency_imp.cpp
similarity index 99%
rename from level_zero/sysman/source/frequency/windows/os_frequency_imp.cpp
rename to level_zero/sysman/source/frequency/windows/sysman_os_frequency_imp.cpp
index da04e5bfad..2bac0289b4 100644
--- a/level_zero/sysman/source/frequency/windows/os_frequency_imp.cpp
+++ b/level_zero/sysman/source/frequency/windows/sysman_os_frequency_imp.cpp
@@ -5,11 +5,11 @@
  *
  */
 
-#include "level_zero/sysman/source/frequency/windows/os_frequency_imp.h"
+#include "level_zero/sysman/source/frequency/windows/sysman_os_frequency_imp.h"
 
-#include "level_zero/sysman/source/frequency/frequency.h"
+#include "level_zero/sysman/source/frequency/sysman_frequency.h"
 #include "level_zero/sysman/source/sysman_const.h"
-#include "level_zero/sysman/source/windows/kmd_sys_manager.h"
+#include "level_zero/sysman/source/windows/sysman_kmd_sys_manager.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/frequency/windows/os_frequency_imp.h b/level_zero/sysman/source/frequency/windows/sysman_os_frequency_imp.h
similarity index 96%
rename from level_zero/sysman/source/frequency/windows/os_frequency_imp.h
rename to level_zero/sysman/source/frequency/windows/sysman_os_frequency_imp.h
index 22c1fb88a1..0333222bfb 100644
--- a/level_zero/sysman/source/frequency/windows/os_frequency_imp.h
+++ b/level_zero/sysman/source/frequency/windows/sysman_os_frequency_imp.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/frequency/os_frequency.h"
-#include "level_zero/sysman/source/windows/os_sysman_imp.h"
+#include "level_zero/sysman/source/frequency/sysman_os_frequency.h"
+#include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 
 #define KMD_BIT_RANGE(endbit, startbit) ((endbit) - (startbit) + 1)
 
diff --git a/level_zero/sysman/source/global_operations/CMakeLists.txt b/level_zero/sysman/source/global_operations/CMakeLists.txt
index 6ace244c2e..b01757b0b4 100644
--- a/level_zero/sysman/source/global_operations/CMakeLists.txt
+++ b/level_zero/sysman/source/global_operations/CMakeLists.txt
@@ -7,10 +7,10 @@
 target_sources(${L0_STATIC_LIB_NAME}
                PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/global_operations.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/global_operations_imp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/global_operations_imp.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_global_operations.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_global_operations_imp.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_global_operations_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_global_operations.h
 )
 
-add_subdirectories()
\ No newline at end of file
+add_subdirectories()
diff --git a/level_zero/sysman/source/global_operations/linux/CMakeLists.txt b/level_zero/sysman/source/global_operations/linux/CMakeLists.txt
index 7eb1e6327e..8a1659136b 100644
--- a/level_zero/sysman/source/global_operations/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/global_operations/linux/CMakeLists.txt
@@ -8,20 +8,20 @@ if(UNIX)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_imp.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_global_operations_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_global_operations_imp.h
   )
 
   if(NEO_ENABLE_i915_PRELIM_DETECTION)
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_helper_prelim.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_global_operations_helper_prelim.cpp
     )
   else()
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_helper.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_global_operations_helper.cpp
     )
   endif()
 
-endif()
\ No newline at end of file
+endif()
diff --git a/level_zero/sysman/source/global_operations/linux/os_global_operations_helper.cpp b/level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_helper.cpp
similarity index 71%
rename from level_zero/sysman/source/global_operations/linux/os_global_operations_helper.cpp
rename to level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_helper.cpp
index 998a69c3f7..bcc94aa4e4 100644
--- a/level_zero/sysman/source/global_operations/linux/os_global_operations_helper.cpp
+++ b/level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_helper.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/global_operations/linux/os_global_operations_imp.h"
+#include "level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/global_operations/linux/os_global_operations_helper_prelim.cpp b/level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_helper_prelim.cpp
similarity index 83%
rename from level_zero/sysman/source/global_operations/linux/os_global_operations_helper_prelim.cpp
rename to level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_helper_prelim.cpp
index dd2cf00f36..9804c91e94 100644
--- a/level_zero/sysman/source/global_operations/linux/os_global_operations_helper_prelim.cpp
+++ b/level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_helper_prelim.cpp
@@ -5,8 +5,8 @@
  *
  */
 
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
-#include "level_zero/sysman/source/global_operations/linux/os_global_operations_imp.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
+#include "level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/global_operations/linux/os_global_operations_imp.cpp b/level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_imp.cpp
similarity index 98%
rename from level_zero/sysman/source/global_operations/linux/os_global_operations_imp.cpp
rename to level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_imp.cpp
index 619d710e68..87014ca0a5 100644
--- a/level_zero/sysman/source/global_operations/linux/os_global_operations_imp.cpp
+++ b/level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/global_operations/linux/os_global_operations_imp.h"
+#include "level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_imp.h"
 
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/ptr_math.h"
@@ -15,9 +15,9 @@
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/pci_path.h"
 
-#include "level_zero/sysman/source/global_operations/global_operations_imp.h"
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/pmt/pmt.h"
+#include "level_zero/sysman/source/global_operations/sysman_global_operations_imp.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 #include <chrono>
diff --git a/level_zero/sysman/source/global_operations/linux/os_global_operations_imp.h b/level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_imp.h
similarity index 94%
rename from level_zero/sysman/source/global_operations/linux/os_global_operations_imp.h
rename to level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_imp.h
index 185f34b934..513ac0de84 100644
--- a/level_zero/sysman/source/global_operations/linux/os_global_operations_imp.h
+++ b/level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_imp.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/os_interface/linux/pmt_util.h"
 
-#include "level_zero/sysman/source/global_operations/os_global_operations.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/global_operations/sysman_os_global_operations.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/global_operations/global_operations.h b/level_zero/sysman/source/global_operations/sysman_global_operations.h
similarity index 100%
rename from level_zero/sysman/source/global_operations/global_operations.h
rename to level_zero/sysman/source/global_operations/sysman_global_operations.h
diff --git a/level_zero/sysman/source/global_operations/global_operations_imp.cpp b/level_zero/sysman/source/global_operations/sysman_global_operations_imp.cpp
similarity index 97%
rename from level_zero/sysman/source/global_operations/global_operations_imp.cpp
rename to level_zero/sysman/source/global_operations/sysman_global_operations_imp.cpp
index 68b5ec5f5f..4bfba05ae6 100644
--- a/level_zero/sysman/source/global_operations/global_operations_imp.cpp
+++ b/level_zero/sysman/source/global_operations/sysman_global_operations_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/global_operations/global_operations_imp.h"
+#include "level_zero/sysman/source/global_operations/sysman_global_operations_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/string.h"
diff --git a/level_zero/sysman/source/global_operations/global_operations_imp.h b/level_zero/sysman/source/global_operations/sysman_global_operations_imp.h
similarity index 86%
rename from level_zero/sysman/source/global_operations/global_operations_imp.h
rename to level_zero/sysman/source/global_operations/sysman_global_operations_imp.h
index f34cb796ed..a61b13337f 100644
--- a/level_zero/sysman/source/global_operations/global_operations_imp.h
+++ b/level_zero/sysman/source/global_operations/sysman_global_operations_imp.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/global_operations/global_operations.h"
-#include "level_zero/sysman/source/global_operations/os_global_operations.h"
+#include "level_zero/sysman/source/global_operations/sysman_global_operations.h"
+#include "level_zero/sysman/source/global_operations/sysman_os_global_operations.h"
 
 #include <mutex>
 
diff --git a/level_zero/sysman/source/global_operations/os_global_operations.h b/level_zero/sysman/source/global_operations/sysman_os_global_operations.h
similarity index 100%
rename from level_zero/sysman/source/global_operations/os_global_operations.h
rename to level_zero/sysman/source/global_operations/sysman_os_global_operations.h
diff --git a/level_zero/sysman/source/global_operations/windows/CMakeLists.txt b/level_zero/sysman/source/global_operations/windows/CMakeLists.txt
index 953f986b70..72ccfb5746 100644
--- a/level_zero/sysman/source/global_operations/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/global_operations/windows/CMakeLists.txt
@@ -8,7 +8,7 @@ if(WIN32)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_imp.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_global_operations_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_global_operations_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_global_operations_imp.cpp
   )
-endif()
\ No newline at end of file
+endif()
diff --git a/level_zero/sysman/source/global_operations/windows/os_global_operations_imp.cpp b/level_zero/sysman/source/global_operations/windows/sysman_os_global_operations_imp.cpp
similarity index 94%
rename from level_zero/sysman/source/global_operations/windows/os_global_operations_imp.cpp
rename to level_zero/sysman/source/global_operations/windows/sysman_os_global_operations_imp.cpp
index aa12e7be4d..8ff21ae650 100644
--- a/level_zero/sysman/source/global_operations/windows/os_global_operations_imp.cpp
+++ b/level_zero/sysman/source/global_operations/windows/sysman_os_global_operations_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/global_operations/windows/os_global_operations_imp.h"
+#include "level_zero/sysman/source/global_operations/windows/sysman_os_global_operations_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/global_operations/windows/os_global_operations_imp.h b/level_zero/sysman/source/global_operations/windows/sysman_os_global_operations_imp.h
similarity index 89%
rename from level_zero/sysman/source/global_operations/windows/os_global_operations_imp.h
rename to level_zero/sysman/source/global_operations/windows/sysman_os_global_operations_imp.h
index ea03a1fa07..3f19d8aaee 100644
--- a/level_zero/sysman/source/global_operations/windows/os_global_operations_imp.h
+++ b/level_zero/sysman/source/global_operations/windows/sysman_os_global_operations_imp.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/global_operations/os_global_operations.h"
-#include "level_zero/sysman/source/windows/os_sysman_imp.h"
+#include "level_zero/sysman/source/global_operations/sysman_os_global_operations.h"
+#include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/linux/CMakeLists.txt b/level_zero/sysman/source/linux/CMakeLists.txt
index 5519d47264..5b0a2a2912 100644
--- a/level_zero/sysman/source/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/linux/CMakeLists.txt
@@ -8,12 +8,12 @@ if(UNIX)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/fs_access.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/fs_access.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_device_id_linux.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_device_id_linux.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/zes_os_sysman_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/zes_os_sysman_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_fs_access.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_fs_access.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_hw_device_id_linux.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_hw_device_id_linux.h
   )
 endif()
 
diff --git a/level_zero/sysman/source/linux/nl_api/CMakeLists.txt b/level_zero/sysman/source/linux/nl_api/CMakeLists.txt
index 9a0c733f78..402d6983ec 100644
--- a/level_zero/sysman/source/linux/nl_api/CMakeLists.txt
+++ b/level_zero/sysman/source/linux/nl_api/CMakeLists.txt
@@ -9,10 +9,10 @@ if(UNIX)
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
                    ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                   ${CMAKE_CURRENT_SOURCE_DIR}/nl_api.h
-                   ${CMAKE_CURRENT_SOURCE_DIR}/nl_api.cpp
-                   ${CMAKE_CURRENT_SOURCE_DIR}/iaf_nl_api.h
-                   ${CMAKE_CURRENT_SOURCE_DIR}/iaf_nl_api.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_nl_api.h
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_nl_api.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_iaf_nl_api.h
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_iaf_nl_api.cpp
     )
   endif()
 endif()
diff --git a/level_zero/sysman/source/linux/nl_api/iaf_nl_api.cpp b/level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.cpp
similarity index 99%
rename from level_zero/sysman/source/linux/nl_api/iaf_nl_api.cpp
rename to level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.cpp
index df7f69efe7..492939704c 100644
--- a/level_zero/sysman/source/linux/nl_api/iaf_nl_api.cpp
+++ b/level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/linux/nl_api/iaf_nl_api.h"
+#include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
 
 #include "shared/source/os_interface/linux/sys_calls.h"
 #include "shared/source/utilities/directory.h"
diff --git a/level_zero/sysman/source/linux/nl_api/iaf_nl_api.h b/level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h
similarity index 98%
rename from level_zero/sysman/source/linux/nl_api/iaf_nl_api.h
rename to level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h
index 0533a1b1b0..3bf712223a 100644
--- a/level_zero/sysman/source/linux/nl_api/iaf_nl_api.h
+++ b/level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/linux/nl_api/nl_api.h"
+#include "level_zero/sysman/source/linux/nl_api/sysman_nl_api.h"
 #include <level_zero/zes_api.h>
 
 #include "iaf/iaf_netlink.h"
diff --git a/level_zero/sysman/source/linux/nl_api/nl_api.cpp b/level_zero/sysman/source/linux/nl_api/sysman_nl_api.cpp
similarity index 99%
rename from level_zero/sysman/source/linux/nl_api/nl_api.cpp
rename to level_zero/sysman/source/linux/nl_api/sysman_nl_api.cpp
index f0449d9ed3..4ec0f3f3b0 100644
--- a/level_zero/sysman/source/linux/nl_api/nl_api.cpp
+++ b/level_zero/sysman/source/linux/nl_api/sysman_nl_api.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "nl_api.h"
+#include "sysman_nl_api.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/os_interface/os_library.h"
diff --git a/level_zero/sysman/source/linux/nl_api/nl_api.h b/level_zero/sysman/source/linux/nl_api/sysman_nl_api.h
similarity index 100%
rename from level_zero/sysman/source/linux/nl_api/nl_api.h
rename to level_zero/sysman/source/linux/nl_api/sysman_nl_api.h
diff --git a/level_zero/sysman/source/linux/pmt/CMakeLists.txt b/level_zero/sysman/source/linux/pmt/CMakeLists.txt
index b7372c0a21..2456113747 100644
--- a/level_zero/sysman/source/linux/pmt/CMakeLists.txt
+++ b/level_zero/sysman/source/linux/pmt/CMakeLists.txt
@@ -8,8 +8,8 @@ if(UNIX)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/pmt_helper.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/pmt.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/pmt.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_pmt_helper.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_pmt.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_pmt.h
   )
 endif()
diff --git a/level_zero/sysman/source/linux/pmt/pmt.cpp b/level_zero/sysman/source/linux/pmt/sysman_pmt.cpp
similarity index 98%
rename from level_zero/sysman/source/linux/pmt/pmt.cpp
rename to level_zero/sysman/source/linux/pmt/sysman_pmt.cpp
index 8a3ed03249..cdb21c189a 100644
--- a/level_zero/sysman/source/linux/pmt/pmt.cpp
+++ b/level_zero/sysman/source/linux/pmt/sysman_pmt.cpp
@@ -5,11 +5,11 @@
  *
  */
 
-#include "level_zero/sysman/source/linux/pmt/pmt.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 #include "level_zero/sysman/source/sysman_device_imp.h"
 
 #include <algorithm>
diff --git a/level_zero/sysman/source/linux/pmt/pmt.h b/level_zero/sysman/source/linux/pmt/sysman_pmt.h
similarity index 97%
rename from level_zero/sysman/source/linux/pmt/pmt.h
rename to level_zero/sysman/source/linux/pmt/sysman_pmt.h
index c8b42e23e0..7f6cdf7b66 100644
--- a/level_zero/sysman/source/linux/pmt/pmt.h
+++ b/level_zero/sysman/source/linux/pmt/sysman_pmt.h
@@ -9,7 +9,7 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 
-#include "level_zero/sysman/source/linux/fs_access.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
 
 #include "igfxfmid.h"
 
diff --git a/level_zero/sysman/source/linux/pmt/pmt_helper.cpp b/level_zero/sysman/source/linux/pmt/sysman_pmt_helper.cpp
similarity index 83%
rename from level_zero/sysman/source/linux/pmt/pmt_helper.cpp
rename to level_zero/sysman/source/linux/pmt/sysman_pmt_helper.cpp
index 319c542c3a..0406b8c2bd 100644
--- a/level_zero/sysman/source/linux/pmt/pmt_helper.cpp
+++ b/level_zero/sysman/source/linux/pmt/sysman_pmt_helper.cpp
@@ -5,8 +5,8 @@
  *
  */
 
-#include "level_zero/sysman/source/linux/pmt/pmt.h"
-#include "level_zero/sysman/source/linux/pmt/pmt_xml_offsets.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt_xml_offsets.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/linux/pmt/pmt_xml_offsets.h b/level_zero/sysman/source/linux/pmt/sysman_pmt_xml_offsets.h
similarity index 100%
rename from level_zero/sysman/source/linux/pmt/pmt_xml_offsets.h
rename to level_zero/sysman/source/linux/pmt/sysman_pmt_xml_offsets.h
diff --git a/level_zero/sysman/source/linux/pmu/CMakeLists.txt b/level_zero/sysman/source/linux/pmu/CMakeLists.txt
index fff9e2cd70..c8465989bd 100644
--- a/level_zero/sysman/source/linux/pmu/CMakeLists.txt
+++ b/level_zero/sysman/source/linux/pmu/CMakeLists.txt
@@ -8,8 +8,8 @@ if(UNIX)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/pmu_imp.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/pmu_imp.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/pmu.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_pmu_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_pmu_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_pmu.h
   )
 endif()
diff --git a/level_zero/sysman/source/linux/pmu/pmu.h b/level_zero/sysman/source/linux/pmu/sysman_pmu.h
similarity index 92%
rename from level_zero/sysman/source/linux/pmu/pmu.h
rename to level_zero/sysman/source/linux/pmu/sysman_pmu.h
index 34d97a5122..76426a0d04 100644
--- a/level_zero/sysman/source/linux/pmu/pmu.h
+++ b/level_zero/sysman/source/linux/pmu/sysman_pmu.h
@@ -7,6 +7,7 @@
 
 #pragma once
 #include <cstdint>
+#include <unistd.h>
 
 namespace L0 {
 namespace Sysman {
@@ -20,4 +21,4 @@ class PmuInterface {
 };
 
 } // namespace Sysman
-} // namespace L0
\ No newline at end of file
+} // namespace L0
diff --git a/level_zero/sysman/source/linux/pmu/pmu_imp.cpp b/level_zero/sysman/source/linux/pmu/sysman_pmu_imp.cpp
similarity index 98%
rename from level_zero/sysman/source/linux/pmu/pmu_imp.cpp
rename to level_zero/sysman/source/linux/pmu/sysman_pmu_imp.cpp
index ca83c5eb4e..689209d090 100644
--- a/level_zero/sysman/source/linux/pmu/pmu_imp.cpp
+++ b/level_zero/sysman/source/linux/pmu/sysman_pmu_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/linux/pmu/pmu_imp.h"
+#include "level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h"
 
 #include "shared/source/memory_manager/memory_manager.h"
 
diff --git a/level_zero/sysman/source/linux/pmu/pmu_imp.h b/level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h
similarity index 86%
rename from level_zero/sysman/source/linux/pmu/pmu_imp.h
rename to level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h
index e5f87ac443..6c1dc64962 100644
--- a/level_zero/sysman/source/linux/pmu/pmu_imp.h
+++ b/level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h
@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/linux/pmu/pmu.h"
+#include "level_zero/sysman/source/linux/pmu/sysman_pmu.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 #include <linux/perf_event.h>
 #include <string>
diff --git a/level_zero/sysman/source/linux/fs_access.cpp b/level_zero/sysman/source/linux/sysman_fs_access.cpp
similarity index 99%
rename from level_zero/sysman/source/linux/fs_access.cpp
rename to level_zero/sysman/source/linux/sysman_fs_access.cpp
index f2c9d9dfdd..2855703d87 100644
--- a/level_zero/sysman/source/linux/fs_access.cpp
+++ b/level_zero/sysman/source/linux/sysman_fs_access.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/linux/fs_access.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
 
 #include <climits>
 
diff --git a/level_zero/sysman/source/linux/fs_access.h b/level_zero/sysman/source/linux/sysman_fs_access.h
similarity index 100%
rename from level_zero/sysman/source/linux/fs_access.h
rename to level_zero/sysman/source/linux/sysman_fs_access.h
diff --git a/level_zero/sysman/source/linux/hw_device_id_linux.cpp b/level_zero/sysman/source/linux/sysman_hw_device_id_linux.cpp
similarity index 94%
rename from level_zero/sysman/source/linux/hw_device_id_linux.cpp
rename to level_zero/sysman/source/linux/sysman_hw_device_id_linux.cpp
index 1b63ff191e..f47de126be 100644
--- a/level_zero/sysman/source/linux/hw_device_id_linux.cpp
+++ b/level_zero/sysman/source/linux/sysman_hw_device_id_linux.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/linux/hw_device_id_linux.h"
+#include "level_zero/sysman/source/linux/sysman_hw_device_id_linux.h"
 
 #include "shared/source/os_interface/linux/sys_calls.h"
 
diff --git a/level_zero/sysman/source/linux/hw_device_id_linux.h b/level_zero/sysman/source/linux/sysman_hw_device_id_linux.h
similarity index 100%
rename from level_zero/sysman/source/linux/hw_device_id_linux.h
rename to level_zero/sysman/source/linux/sysman_hw_device_id_linux.h
diff --git a/level_zero/sysman/source/linux/os_sysman_imp.cpp b/level_zero/sysman/source/linux/zes_os_sysman_imp.cpp
similarity index 98%
rename from level_zero/sysman/source/linux/os_sysman_imp.cpp
rename to level_zero/sysman/source/linux/zes_os_sysman_imp.cpp
index 110dca2c63..b54a795ee7 100644
--- a/level_zero/sysman/source/linux/os_sysman_imp.cpp
+++ b/level_zero/sysman/source/linux/zes_os_sysman_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/gfx_core_helper.h"
@@ -16,10 +16,10 @@
 #include "shared/source/os_interface/linux/system_info.h"
 #include "shared/source/os_interface/os_interface.h"
 
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/pmt/pmt.h"
-#include "level_zero/sysman/source/linux/pmu/pmu.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
+#include "level_zero/sysman/source/linux/pmu/sysman_pmu.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
 
 #include <linux/pci_regs.h>
 
diff --git a/level_zero/sysman/source/linux/os_sysman_imp.h b/level_zero/sysman/source/linux/zes_os_sysman_imp.h
similarity index 97%
rename from level_zero/sysman/source/linux/os_sysman_imp.h
rename to level_zero/sysman/source/linux/zes_os_sysman_imp.h
index 55fd725d22..9d1296510c 100644
--- a/level_zero/sysman/source/linux/os_sysman_imp.h
+++ b/level_zero/sysman/source/linux/zes_os_sysman_imp.h
@@ -10,7 +10,7 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 
-#include "level_zero/sysman/source/linux/hw_device_id_linux.h"
+#include "level_zero/sysman/source/linux/sysman_hw_device_id_linux.h"
 #include "level_zero/sysman/source/os_sysman.h"
 #include "level_zero/sysman/source/sysman_const.h"
 #include "level_zero/sysman/source/sysman_device_imp.h"
diff --git a/level_zero/sysman/source/memory/CMakeLists.txt b/level_zero/sysman/source/memory/CMakeLists.txt
index 5f47c27604..613865b74a 100755
--- a/level_zero/sysman/source/memory/CMakeLists.txt
+++ b/level_zero/sysman/source/memory/CMakeLists.txt
@@ -7,11 +7,11 @@
 target_sources(${L0_STATIC_LIB_NAME}
                PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/memory.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/memory.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/memory_imp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/memory_imp.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/os_memory.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_memory.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_memory.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_memory_imp.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_memory_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_memory.h
 )
 
 add_subdirectories()
diff --git a/level_zero/sysman/source/memory/linux/CMakeLists.txt b/level_zero/sysman/source/memory/linux/CMakeLists.txt
index b2c191205a..917630cb72 100755
--- a/level_zero/sysman/source/memory/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/memory/linux/CMakeLists.txt
@@ -13,20 +13,20 @@ if(UNIX)
   if(NEO_ENABLE_i915_PRELIM_DETECTION)
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp_prelim.cpp
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp_prelim.h
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_memory_imp_prelim.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_memory_imp_prelim.h
     )
   elseif(SUPPORT_DG1 AND "${BRANCH_TYPE}" STREQUAL "")
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.h
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp_dg1.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_memory_imp.h
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_memory_imp_dg1.cpp
     )
   else()
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.h
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_memory_imp.h
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_memory_imp.cpp
     )
   endif()
 endif()
diff --git a/level_zero/sysman/source/memory/linux/os_memory_imp.cpp b/level_zero/sysman/source/memory/linux/sysman_os_memory_imp.cpp
similarity index 92%
rename from level_zero/sysman/source/memory/linux/os_memory_imp.cpp
rename to level_zero/sysman/source/memory/linux/sysman_os_memory_imp.cpp
index 302c7e5f41..5244a18fb6 100644
--- a/level_zero/sysman/source/memory/linux/os_memory_imp.cpp
+++ b/level_zero/sysman/source/memory/linux/sysman_os_memory_imp.cpp
@@ -5,11 +5,11 @@
  *
  */
 
-#include "level_zero/sysman/source/memory/linux/os_memory_imp.h"
+#include "level_zero/sysman/source/memory/linux/sysman_os_memory_imp.h"
 
 #include "shared/source/helpers/gfx_core_helper.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/memory/linux/os_memory_imp.h b/level_zero/sysman/source/memory/linux/sysman_os_memory_imp.h
similarity index 94%
rename from level_zero/sysman/source/memory/linux/os_memory_imp.h
rename to level_zero/sysman/source/memory/linux/sysman_os_memory_imp.h
index c442dec705..da4ef2ed5e 100644
--- a/level_zero/sysman/source/memory/linux/os_memory_imp.h
+++ b/level_zero/sysman/source/memory/linux/sysman_os_memory_imp.h
@@ -9,7 +9,7 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 
-#include "level_zero/sysman/source/memory/os_memory.h"
+#include "level_zero/sysman/source/memory/sysman_os_memory.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/memory/linux/os_memory_imp_dg1.cpp b/level_zero/sysman/source/memory/linux/sysman_os_memory_imp_dg1.cpp
similarity index 95%
rename from level_zero/sysman/source/memory/linux/os_memory_imp_dg1.cpp
rename to level_zero/sysman/source/memory/linux/sysman_os_memory_imp_dg1.cpp
index e3c8c591fa..a8d9af08bb 100644
--- a/level_zero/sysman/source/memory/linux/os_memory_imp_dg1.cpp
+++ b/level_zero/sysman/source/memory/linux/sysman_os_memory_imp_dg1.cpp
@@ -9,8 +9,8 @@
 #include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/memory_info.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/memory/linux/os_memory_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
+#include "level_zero/sysman/source/memory/linux/sysman_os_memory_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/memory/linux/os_memory_imp_prelim.cpp b/level_zero/sysman/source/memory/linux/sysman_os_memory_imp_prelim.cpp
similarity index 98%
rename from level_zero/sysman/source/memory/linux/os_memory_imp_prelim.cpp
rename to level_zero/sysman/source/memory/linux/sysman_os_memory_imp_prelim.cpp
index 2d295a6290..282c8b2ec5 100644
--- a/level_zero/sysman/source/memory/linux/os_memory_imp_prelim.cpp
+++ b/level_zero/sysman/source/memory/linux/sysman_os_memory_imp_prelim.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/memory/linux/os_memory_imp_prelim.h"
+#include "level_zero/sysman/source/memory/linux/sysman_os_memory_imp_prelim.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/gfx_core_helper.h"
@@ -13,8 +13,8 @@
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/system_info.h"
 
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 #include "drm/intel_hwconfig_types.h"
diff --git a/level_zero/sysman/source/memory/linux/os_memory_imp_prelim.h b/level_zero/sysman/source/memory/linux/sysman_os_memory_imp_prelim.h
similarity index 90%
rename from level_zero/sysman/source/memory/linux/os_memory_imp_prelim.h
rename to level_zero/sysman/source/memory/linux/sysman_os_memory_imp_prelim.h
index d0bae6fc1d..c9e4388741 100644
--- a/level_zero/sysman/source/memory/linux/os_memory_imp_prelim.h
+++ b/level_zero/sysman/source/memory/linux/sysman_os_memory_imp_prelim.h
@@ -9,9 +9,9 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/linux/drm_neo.h"
 
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/pmt/pmt.h"
-#include "level_zero/sysman/source/memory/os_memory.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/memory/sysman_os_memory.h"
 #include "level_zero/sysman/source/sysman_device_imp.h"
 
 #include <map>
diff --git a/level_zero/sysman/source/memory/memory.cpp b/level_zero/sysman/source/memory/sysman_memory.cpp
similarity index 96%
rename from level_zero/sysman/source/memory/memory.cpp
rename to level_zero/sysman/source/memory/sysman_memory.cpp
index 88ffb71d4b..89beeadff2 100644
--- a/level_zero/sysman/source/memory/memory.cpp
+++ b/level_zero/sysman/source/memory/sysman_memory.cpp
@@ -8,7 +8,7 @@
 #include "shared/source/helpers/basic_math.h"
 #include "shared/source/memory_manager/memory_manager.h"
 
-#include "level_zero/sysman/source/memory/memory_imp.h"
+#include "level_zero/sysman/source/memory/sysman_memory_imp.h"
 #include "level_zero/sysman/source/os_sysman.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/source/memory/memory.h b/level_zero/sysman/source/memory/sysman_memory.h
similarity index 100%
rename from level_zero/sysman/source/memory/memory.h
rename to level_zero/sysman/source/memory/sysman_memory.h
diff --git a/level_zero/sysman/source/memory/memory_imp.cpp b/level_zero/sysman/source/memory/sysman_memory_imp.cpp
similarity index 94%
rename from level_zero/sysman/source/memory/memory_imp.cpp
rename to level_zero/sysman/source/memory/sysman_memory_imp.cpp
index b57ef6253c..38e2f2a00d 100644
--- a/level_zero/sysman/source/memory/memory_imp.cpp
+++ b/level_zero/sysman/source/memory/sysman_memory_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/memory/memory_imp.h"
+#include "level_zero/sysman/source/memory/sysman_memory_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/memory/memory_imp.h b/level_zero/sysman/source/memory/sysman_memory_imp.h
similarity index 88%
rename from level_zero/sysman/source/memory/memory_imp.h
rename to level_zero/sysman/source/memory/sysman_memory_imp.h
index a0aa4ffb65..0036da88e9 100644
--- a/level_zero/sysman/source/memory/memory_imp.h
+++ b/level_zero/sysman/source/memory/sysman_memory_imp.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/memory/memory.h"
-#include "level_zero/sysman/source/memory/os_memory.h"
+#include "level_zero/sysman/source/memory/sysman_memory.h"
+#include "level_zero/sysman/source/memory/sysman_os_memory.h"
 #include <level_zero/zes_api.h>
 
 namespace L0 {
diff --git a/level_zero/sysman/source/memory/os_memory.h b/level_zero/sysman/source/memory/sysman_os_memory.h
similarity index 100%
rename from level_zero/sysman/source/memory/os_memory.h
rename to level_zero/sysman/source/memory/sysman_os_memory.h
diff --git a/level_zero/sysman/source/memory/windows/CMakeLists.txt b/level_zero/sysman/source/memory/windows/CMakeLists.txt
index 887e9d65e6..c8ad417d4b 100755
--- a/level_zero/sysman/source/memory/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/memory/windows/CMakeLists.txt
@@ -8,7 +8,7 @@ if(WIN32)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_memory_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_memory_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_memory_imp.cpp
   )
 endif()
diff --git a/level_zero/sysman/source/memory/windows/os_memory_imp.cpp b/level_zero/sysman/source/memory/windows/sysman_os_memory_imp.cpp
similarity index 85%
rename from level_zero/sysman/source/memory/windows/os_memory_imp.cpp
rename to level_zero/sysman/source/memory/windows/sysman_os_memory_imp.cpp
index aee918e003..8d573c5afd 100644
--- a/level_zero/sysman/source/memory/windows/os_memory_imp.cpp
+++ b/level_zero/sysman/source/memory/windows/sysman_os_memory_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/memory/windows/os_memory_imp.h"
+#include "level_zero/sysman/source/memory/windows/sysman_os_memory_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/memory/windows/os_memory_imp.h b/level_zero/sysman/source/memory/windows/sysman_os_memory_imp.h
similarity index 93%
rename from level_zero/sysman/source/memory/windows/os_memory_imp.h
rename to level_zero/sysman/source/memory/windows/sysman_os_memory_imp.h
index 8140bcbd59..a4224f62d0 100644
--- a/level_zero/sysman/source/memory/windows/os_memory_imp.h
+++ b/level_zero/sysman/source/memory/windows/sysman_os_memory_imp.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/memory/os_memory.h"
+#include "level_zero/sysman/source/memory/sysman_os_memory.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/pci/CMakeLists.txt b/level_zero/sysman/source/pci/CMakeLists.txt
index 420a6572f8..d5a011b732 100644
--- a/level_zero/sysman/source/pci/CMakeLists.txt
+++ b/level_zero/sysman/source/pci/CMakeLists.txt
@@ -7,10 +7,10 @@
 target_sources(${L0_STATIC_LIB_NAME}
                PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/pci.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/pci_imp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/pci_imp.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/os_pci.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_pci.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_pci_imp.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_pci_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_pci.h
 )
 
 add_subdirectories()
diff --git a/level_zero/sysman/source/pci/linux/CMakeLists.txt b/level_zero/sysman/source/pci/linux/CMakeLists.txt
index d80f6f183a..cac68e3e76 100644
--- a/level_zero/sysman/source/pci/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/pci/linux/CMakeLists.txt
@@ -8,7 +8,7 @@ if(UNIX)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_pci_imp.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_pci_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_pci_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_pci_imp.h
   )
 endif()
diff --git a/level_zero/sysman/source/pci/linux/os_pci_imp.cpp b/level_zero/sysman/source/pci/linux/sysman_os_pci_imp.cpp
similarity index 98%
rename from level_zero/sysman/source/pci/linux/os_pci_imp.cpp
rename to level_zero/sysman/source/pci/linux/sysman_os_pci_imp.cpp
index 5ed53b295c..8775d617ae 100644
--- a/level_zero/sysman/source/pci/linux/os_pci_imp.cpp
+++ b/level_zero/sysman/source/pci/linux/sysman_os_pci_imp.cpp
@@ -5,14 +5,14 @@
  *
  */
 
-#include "level_zero/sysman/source/pci/linux/os_pci_imp.h"
+#include "level_zero/sysman/source/pci/linux/sysman_os_pci_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/utilities/directory.h"
 
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/pci/pci_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
+#include "level_zero/sysman/source/pci/sysman_pci_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 #include <linux/pci_regs.h>
diff --git a/level_zero/sysman/source/pci/linux/os_pci_imp.h b/level_zero/sysman/source/pci/linux/sysman_os_pci_imp.h
similarity index 97%
rename from level_zero/sysman/source/pci/linux/os_pci_imp.h
rename to level_zero/sysman/source/pci/linux/sysman_os_pci_imp.h
index 5ea263b59c..2ed09aae77 100644
--- a/level_zero/sysman/source/pci/linux/os_pci_imp.h
+++ b/level_zero/sysman/source/pci/linux/sysman_os_pci_imp.h
@@ -9,7 +9,7 @@
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 #include "shared/source/os_interface/linux/sys_calls.h"
 
-#include "level_zero/sysman/source/pci/os_pci.h"
+#include "level_zero/sysman/source/pci/sysman_os_pci.h"
 
 #include <fcntl.h>
 #include <memory>
diff --git a/level_zero/sysman/source/pci/os_pci.h b/level_zero/sysman/source/pci/sysman_os_pci.h
similarity index 100%
rename from level_zero/sysman/source/pci/os_pci.h
rename to level_zero/sysman/source/pci/sysman_os_pci.h
diff --git a/level_zero/sysman/source/pci/pci.h b/level_zero/sysman/source/pci/sysman_pci.h
similarity index 100%
rename from level_zero/sysman/source/pci/pci.h
rename to level_zero/sysman/source/pci/sysman_pci.h
diff --git a/level_zero/sysman/source/pci/pci_imp.cpp b/level_zero/sysman/source/pci/sysman_pci_imp.cpp
similarity index 98%
rename from level_zero/sysman/source/pci/pci_imp.cpp
rename to level_zero/sysman/source/pci/sysman_pci_imp.cpp
index 086bfbd068..ce7811de8c 100644
--- a/level_zero/sysman/source/pci/pci_imp.cpp
+++ b/level_zero/sysman/source/pci/sysman_pci_imp.cpp
@@ -5,13 +5,13 @@
  *
  */
 
-#include "level_zero/sysman/source/pci/pci_imp.h"
+#include "level_zero/sysman/source/pci/sysman_pci_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 #include "shared/source/helpers/string.h"
 #include "shared/source/utilities/directory.h"
 
-#include "level_zero/sysman/source/pci/os_pci.h"
+#include "level_zero/sysman/source/pci/sysman_os_pci.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 #include <algorithm>
diff --git a/level_zero/sysman/source/pci/pci_imp.h b/level_zero/sysman/source/pci/sysman_pci_imp.h
similarity index 95%
rename from level_zero/sysman/source/pci/pci_imp.h
rename to level_zero/sysman/source/pci/sysman_pci_imp.h
index 2528d6c15e..0c4f25835c 100644
--- a/level_zero/sysman/source/pci/pci_imp.h
+++ b/level_zero/sysman/source/pci/sysman_pci_imp.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/pci/pci.h"
+#include "level_zero/sysman/source/pci/sysman_pci.h"
 
 #include <mutex>
 #include <vector>
diff --git a/level_zero/sysman/source/pci/windows/CMakeLists.txt b/level_zero/sysman/source/pci/windows/CMakeLists.txt
index 9451801b48..5686dbe853 100644
--- a/level_zero/sysman/source/pci/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/pci/windows/CMakeLists.txt
@@ -8,7 +8,7 @@ if(WIN32)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_pci_imp.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_pci_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_pci_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_pci_imp.h
   )
 endif()
diff --git a/level_zero/sysman/source/pci/windows/os_pci_imp.cpp b/level_zero/sysman/source/pci/windows/sysman_os_pci_imp.cpp
similarity index 94%
rename from level_zero/sysman/source/pci/windows/os_pci_imp.cpp
rename to level_zero/sysman/source/pci/windows/sysman_os_pci_imp.cpp
index 9796fc7286..7f15ed22ef 100644
--- a/level_zero/sysman/source/pci/windows/os_pci_imp.cpp
+++ b/level_zero/sysman/source/pci/windows/sysman_os_pci_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/pci/windows/os_pci_imp.h"
+#include "level_zero/sysman/source/pci/windows/sysman_os_pci_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/pci/windows/os_pci_imp.h b/level_zero/sysman/source/pci/windows/sysman_os_pci_imp.h
similarity index 94%
rename from level_zero/sysman/source/pci/windows/os_pci_imp.h
rename to level_zero/sysman/source/pci/windows/sysman_os_pci_imp.h
index e31a7e129e..01cb2796a4 100644
--- a/level_zero/sysman/source/pci/windows/os_pci_imp.h
+++ b/level_zero/sysman/source/pci/windows/sysman_os_pci_imp.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/pci/os_pci.h"
+#include "level_zero/sysman/source/pci/sysman_os_pci.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/performance/CMakeLists.txt b/level_zero/sysman/source/performance/CMakeLists.txt
index 75084f877c..448f164b27 100644
--- a/level_zero/sysman/source/performance/CMakeLists.txt
+++ b/level_zero/sysman/source/performance/CMakeLists.txt
@@ -7,11 +7,11 @@
 target_sources(${L0_STATIC_LIB_NAME}
                PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/performance.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/performance.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/performance_imp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/performance_imp.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/os_performance.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_performance.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_performance.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_performance_imp.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_performance_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_performance.h
 )
 
 add_subdirectories()
diff --git a/level_zero/sysman/source/performance/linux/CMakeLists.txt b/level_zero/sysman/source/performance/linux/CMakeLists.txt
index e00f2ed4c0..7a871cefe5 100644
--- a/level_zero/sysman/source/performance/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/performance/linux/CMakeLists.txt
@@ -13,14 +13,14 @@ if(UNIX)
   if(NEO_ENABLE_i915_PRELIM_DETECTION)
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp_prelim.cpp
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp_prelim.h
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_performance_imp_prelim.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_performance_imp_prelim.h
     )
   else()
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp.cpp
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp.h
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_performance_imp.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_performance_imp.h
     )
   endif()
 endif()
diff --git a/level_zero/sysman/source/performance/linux/os_performance_imp.cpp b/level_zero/sysman/source/performance/linux/sysman_os_performance_imp.cpp
similarity index 92%
rename from level_zero/sysman/source/performance/linux/os_performance_imp.cpp
rename to level_zero/sysman/source/performance/linux/sysman_os_performance_imp.cpp
index 788a9e03b1..4560208fdb 100644
--- a/level_zero/sysman/source/performance/linux/os_performance_imp.cpp
+++ b/level_zero/sysman/source/performance/linux/sysman_os_performance_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/performance/linux/os_performance_imp.h"
+#include "level_zero/sysman/source/performance/linux/sysman_os_performance_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
diff --git a/level_zero/sysman/source/performance/linux/os_performance_imp.h b/level_zero/sysman/source/performance/linux/sysman_os_performance_imp.h
similarity index 80%
rename from level_zero/sysman/source/performance/linux/os_performance_imp.h
rename to level_zero/sysman/source/performance/linux/sysman_os_performance_imp.h
index 5634da1036..c08c409558 100644
--- a/level_zero/sysman/source/performance/linux/os_performance_imp.h
+++ b/level_zero/sysman/source/performance/linux/sysman_os_performance_imp.h
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/performance/os_performance.h"
-#include "level_zero/sysman/source/performance/performance_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
+#include "level_zero/sysman/source/performance/sysman_os_performance.h"
+#include "level_zero/sysman/source/performance/sysman_performance_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/performance/linux/os_performance_imp_prelim.cpp b/level_zero/sysman/source/performance/linux/sysman_os_performance_imp_prelim.cpp
similarity index 99%
rename from level_zero/sysman/source/performance/linux/os_performance_imp_prelim.cpp
rename to level_zero/sysman/source/performance/linux/sysman_os_performance_imp_prelim.cpp
index 0b4a37b556..b6826db4a2 100644
--- a/level_zero/sysman/source/performance/linux/os_performance_imp_prelim.cpp
+++ b/level_zero/sysman/source/performance/linux/sysman_os_performance_imp_prelim.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/performance/linux/os_performance_imp_prelim.h"
+#include "level_zero/sysman/source/performance/linux/sysman_os_performance_imp_prelim.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/device/device.h"
diff --git a/level_zero/sysman/source/performance/linux/os_performance_imp_prelim.h b/level_zero/sysman/source/performance/linux/sysman_os_performance_imp_prelim.h
similarity index 87%
rename from level_zero/sysman/source/performance/linux/os_performance_imp_prelim.h
rename to level_zero/sysman/source/performance/linux/sysman_os_performance_imp_prelim.h
index 360bf620a2..a0b289d23e 100644
--- a/level_zero/sysman/source/performance/linux/os_performance_imp_prelim.h
+++ b/level_zero/sysman/source/performance/linux/sysman_os_performance_imp_prelim.h
@@ -8,10 +8,10 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/performance/os_performance.h"
-#include "level_zero/sysman/source/performance/performance_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
+#include "level_zero/sysman/source/performance/sysman_os_performance.h"
+#include "level_zero/sysman/source/performance/sysman_performance_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/performance/os_performance.h b/level_zero/sysman/source/performance/sysman_os_performance.h
similarity index 100%
rename from level_zero/sysman/source/performance/os_performance.h
rename to level_zero/sysman/source/performance/sysman_os_performance.h
diff --git a/level_zero/sysman/source/performance/performance.cpp b/level_zero/sysman/source/performance/sysman_performance.cpp
similarity index 93%
rename from level_zero/sysman/source/performance/performance.cpp
rename to level_zero/sysman/source/performance/sysman_performance.cpp
index cf4a81044e..18c18954e4 100644
--- a/level_zero/sysman/source/performance/performance.cpp
+++ b/level_zero/sysman/source/performance/sysman_performance.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "level_zero/sysman/source/performance/performance.h"
+#include "level_zero/sysman/source/performance/sysman_performance.h"
 
 #include "level_zero/sysman/source/os_sysman.h"
-#include "level_zero/sysman/source/performance/performance_imp.h"
+#include "level_zero/sysman/source/performance/sysman_performance_imp.h"
 
 #include <algorithm>
 
diff --git a/level_zero/sysman/source/performance/performance.h b/level_zero/sysman/source/performance/sysman_performance.h
similarity index 100%
rename from level_zero/sysman/source/performance/performance.h
rename to level_zero/sysman/source/performance/sysman_performance.h
diff --git a/level_zero/sysman/source/performance/performance_imp.cpp b/level_zero/sysman/source/performance/sysman_performance_imp.cpp
similarity index 95%
rename from level_zero/sysman/source/performance/performance_imp.cpp
rename to level_zero/sysman/source/performance/sysman_performance_imp.cpp
index f8afdd1719..37440e756c 100644
--- a/level_zero/sysman/source/performance/performance_imp.cpp
+++ b/level_zero/sysman/source/performance/sysman_performance_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/performance/performance_imp.h"
+#include "level_zero/sysman/source/performance/sysman_performance_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 
diff --git a/level_zero/sysman/source/performance/performance_imp.h b/level_zero/sysman/source/performance/sysman_performance_imp.h
similarity index 86%
rename from level_zero/sysman/source/performance/performance_imp.h
rename to level_zero/sysman/source/performance/sysman_performance_imp.h
index 7636e5428c..49d606d1b5 100644
--- a/level_zero/sysman/source/performance/performance_imp.h
+++ b/level_zero/sysman/source/performance/sysman_performance_imp.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/performance/os_performance.h"
-#include "level_zero/sysman/source/performance/performance.h"
+#include "level_zero/sysman/source/performance/sysman_os_performance.h"
+#include "level_zero/sysman/source/performance/sysman_performance.h"
 #include <level_zero/zes_api.h>
 
 namespace L0 {
diff --git a/level_zero/sysman/source/performance/windows/CMakeLists.txt b/level_zero/sysman/source/performance/windows/CMakeLists.txt
index 6ca47a1104..081791084a 100644
--- a/level_zero/sysman/source/performance/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/performance/windows/CMakeLists.txt
@@ -8,7 +8,7 @@ if(WIN32)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_performance_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_performance_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_performance_imp.h
   )
 endif()
diff --git a/level_zero/sysman/source/performance/windows/os_performance_imp.cpp b/level_zero/sysman/source/performance/windows/sysman_os_performance_imp.cpp
similarity index 93%
rename from level_zero/sysman/source/performance/windows/os_performance_imp.cpp
rename to level_zero/sysman/source/performance/windows/sysman_os_performance_imp.cpp
index 67d98215be..1e736c5fb8 100644
--- a/level_zero/sysman/source/performance/windows/os_performance_imp.cpp
+++ b/level_zero/sysman/source/performance/windows/sysman_os_performance_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/performance/windows/os_performance_imp.h"
+#include "level_zero/sysman/source/performance/windows/sysman_os_performance_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/performance/windows/os_performance_imp.h b/level_zero/sysman/source/performance/windows/sysman_os_performance_imp.h
similarity index 84%
rename from level_zero/sysman/source/performance/windows/os_performance_imp.h
rename to level_zero/sysman/source/performance/windows/sysman_os_performance_imp.h
index f65ccbae33..f2926e560b 100644
--- a/level_zero/sysman/source/performance/windows/os_performance_imp.h
+++ b/level_zero/sysman/source/performance/windows/sysman_os_performance_imp.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/performance/os_performance.h"
-#include "level_zero/sysman/source/windows/os_sysman_imp.h"
+#include "level_zero/sysman/source/performance/sysman_os_performance.h"
+#include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/power/CMakeLists.txt b/level_zero/sysman/source/power/CMakeLists.txt
index 5fc7b9e3a7..b71ef2b188 100644
--- a/level_zero/sysman/source/power/CMakeLists.txt
+++ b/level_zero/sysman/source/power/CMakeLists.txt
@@ -7,11 +7,11 @@
 target_sources(${L0_STATIC_LIB_NAME}
                PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/power.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/power.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/power_imp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/power_imp.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/os_power.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_power.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_power.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_power_imp.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_power_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_power.h
 )
 
 add_subdirectories()
diff --git a/level_zero/sysman/source/power/linux/CMakeLists.txt b/level_zero/sysman/source/power/linux/CMakeLists.txt
index 094f87d8bd..0359ba3db4 100644
--- a/level_zero/sysman/source/power/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/power/linux/CMakeLists.txt
@@ -13,15 +13,15 @@ if(UNIX)
   if(NEO_ENABLE_i915_PRELIM_DETECTION)
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp_prelim.cpp
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp_prelim.h
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_power_imp_prelim.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_power_imp_prelim.h
 
     )
   else()
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp.cpp
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp.h
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_power_imp.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_power_imp.h
     )
   endif()
 endif()
diff --git a/level_zero/sysman/source/power/linux/os_power_imp.cpp b/level_zero/sysman/source/power/linux/sysman_os_power_imp.cpp
similarity index 98%
rename from level_zero/sysman/source/power/linux/os_power_imp.cpp
rename to level_zero/sysman/source/power/linux/sysman_os_power_imp.cpp
index 24c381ef18..bfbe969442 100644
--- a/level_zero/sysman/source/power/linux/os_power_imp.cpp
+++ b/level_zero/sysman/source/power/linux/sysman_os_power_imp.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "level_zero/sysman/source/power/linux/os_power_imp.h"
+#include "level_zero/sysman/source/power/linux/sysman_os_power_imp.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/linux/pmt/pmt.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/source/power/linux/os_power_imp.h b/level_zero/sysman/source/power/linux/sysman_os_power_imp.h
similarity index 97%
rename from level_zero/sysman/source/power/linux/os_power_imp.h
rename to level_zero/sysman/source/power/linux/sysman_os_power_imp.h
index b6fb1145bc..3e77ae31f7 100644
--- a/level_zero/sysman/source/power/linux/os_power_imp.h
+++ b/level_zero/sysman/source/power/linux/sysman_os_power_imp.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/power/os_power.h"
+#include "level_zero/sysman/source/power/sysman_os_power.h"
 
 #include <memory>
 #include <string>
diff --git a/level_zero/sysman/source/power/linux/os_power_imp_prelim.cpp b/level_zero/sysman/source/power/linux/sysman_os_power_imp_prelim.cpp
similarity index 98%
rename from level_zero/sysman/source/power/linux/os_power_imp_prelim.cpp
rename to level_zero/sysman/source/power/linux/sysman_os_power_imp_prelim.cpp
index 1adcd68778..0a04012faa 100644
--- a/level_zero/sysman/source/power/linux/os_power_imp_prelim.cpp
+++ b/level_zero/sysman/source/power/linux/sysman_os_power_imp_prelim.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "level_zero/sysman/source/power/linux/os_power_imp_prelim.h"
+#include "level_zero/sysman/source/power/linux/sysman_os_power_imp_prelim.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/linux/pmt/pmt.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/source/power/linux/os_power_imp_prelim.h b/level_zero/sysman/source/power/linux/sysman_os_power_imp_prelim.h
similarity index 97%
rename from level_zero/sysman/source/power/linux/os_power_imp_prelim.h
rename to level_zero/sysman/source/power/linux/sysman_os_power_imp_prelim.h
index b9d9cb582e..52fba8dd6d 100644
--- a/level_zero/sysman/source/power/linux/os_power_imp_prelim.h
+++ b/level_zero/sysman/source/power/linux/sysman_os_power_imp_prelim.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/power/os_power.h"
+#include "level_zero/sysman/source/power/sysman_os_power.h"
 
 #include "igfxfmid.h"
 
diff --git a/level_zero/sysman/source/power/os_power.h b/level_zero/sysman/source/power/sysman_os_power.h
similarity index 100%
rename from level_zero/sysman/source/power/os_power.h
rename to level_zero/sysman/source/power/sysman_os_power.h
diff --git a/level_zero/sysman/source/power/power.cpp b/level_zero/sysman/source/power/sysman_power.cpp
similarity index 94%
rename from level_zero/sysman/source/power/power.cpp
rename to level_zero/sysman/source/power/sysman_power.cpp
index c7a4af1552..ac815e0052 100644
--- a/level_zero/sysman/source/power/power.cpp
+++ b/level_zero/sysman/source/power/sysman_power.cpp
@@ -5,12 +5,12 @@
  *
  */
 
-#include "level_zero/sysman/source/power/power.h"
+#include "level_zero/sysman/source/power/sysman_power.h"
 
 #include "shared/source/helpers/basic_math.h"
 
 #include "level_zero/sysman/source/os_sysman.h"
-#include "level_zero/sysman/source/power/power_imp.h"
+#include "level_zero/sysman/source/power/sysman_power_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/power/power.h b/level_zero/sysman/source/power/sysman_power.h
similarity index 100%
rename from level_zero/sysman/source/power/power.h
rename to level_zero/sysman/source/power/sysman_power.h
diff --git a/level_zero/sysman/source/power/power_imp.cpp b/level_zero/sysman/source/power/sysman_power_imp.cpp
similarity index 95%
rename from level_zero/sysman/source/power/power_imp.cpp
rename to level_zero/sysman/source/power/sysman_power_imp.cpp
index b4b6f3f093..27abb0e83f 100644
--- a/level_zero/sysman/source/power/power_imp.cpp
+++ b/level_zero/sysman/source/power/sysman_power_imp.cpp
@@ -5,11 +5,11 @@
  *
  */
 
-#include "level_zero/sysman/source/power/power_imp.h"
+#include "level_zero/sysman/source/power/sysman_power_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 
-#include "level_zero/sysman/source/power/os_power.h"
+#include "level_zero/sysman/source/power/sysman_os_power.h"
 #include "level_zero/sysman/source/sysman_device_imp.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/source/power/power_imp.h b/level_zero/sysman/source/power/sysman_power_imp.h
similarity index 96%
rename from level_zero/sysman/source/power/power_imp.h
rename to level_zero/sysman/source/power/sysman_power_imp.h
index a50904fd2b..afdaaa8904 100644
--- a/level_zero/sysman/source/power/power_imp.h
+++ b/level_zero/sysman/source/power/sysman_power_imp.h
@@ -9,7 +9,7 @@
 
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/power/power.h"
+#include "level_zero/sysman/source/power/sysman_power.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/power/windows/CMakeLists.txt b/level_zero/sysman/source/power/windows/CMakeLists.txt
index 990b214d21..3e43536cbe 100644
--- a/level_zero/sysman/source/power/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/power/windows/CMakeLists.txt
@@ -8,7 +8,7 @@ if(WIN32)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_power_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_power_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_power_imp.cpp
   )
 endif()
diff --git a/level_zero/sysman/source/power/windows/os_power_imp.cpp b/level_zero/sysman/source/power/windows/sysman_os_power_imp.cpp
similarity index 98%
rename from level_zero/sysman/source/power/windows/os_power_imp.cpp
rename to level_zero/sysman/source/power/windows/sysman_os_power_imp.cpp
index e94289691b..5dd984fb00 100644
--- a/level_zero/sysman/source/power/windows/os_power_imp.cpp
+++ b/level_zero/sysman/source/power/windows/sysman_os_power_imp.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "level_zero/sysman/source/power/windows/os_power_imp.h"
+#include "level_zero/sysman/source/power/windows/sysman_os_power_imp.h"
 
-#include "level_zero/sysman/source/windows/kmd_sys_manager.h"
-#include "level_zero/sysman/source/windows/os_sysman_imp.h"
+#include "level_zero/sysman/source/windows/sysman_kmd_sys_manager.h"
+#include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/power/windows/os_power_imp.h b/level_zero/sysman/source/power/windows/sysman_os_power_imp.h
similarity index 96%
rename from level_zero/sysman/source/power/windows/os_power_imp.h
rename to level_zero/sysman/source/power/windows/sysman_os_power_imp.h
index a06b9d9faa..80d7e08b04 100644
--- a/level_zero/sysman/source/power/windows/os_power_imp.h
+++ b/level_zero/sysman/source/power/windows/sysman_os_power_imp.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/power/os_power.h"
+#include "level_zero/sysman/source/power/sysman_os_power.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/ras/CMakeLists.txt b/level_zero/sysman/source/ras/CMakeLists.txt
index 280a476630..a911bb56b1 100644
--- a/level_zero/sysman/source/ras/CMakeLists.txt
+++ b/level_zero/sysman/source/ras/CMakeLists.txt
@@ -7,11 +7,11 @@
 target_sources(${L0_STATIC_LIB_NAME}
                PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/os_ras.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/ras.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/ras.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/ras_imp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/ras_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_ras.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_ras.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_ras.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_ras_imp.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_ras_imp.h
 )
 
 add_subdirectories()
diff --git a/level_zero/sysman/source/ras/linux/CMakeLists.txt b/level_zero/sysman/source/ras/linux/CMakeLists.txt
index d04796bf6c..520d68e83d 100644
--- a/level_zero/sysman/source/ras/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/ras/linux/CMakeLists.txt
@@ -13,16 +13,16 @@ if(UNIX)
   if(NEO_ENABLE_i915_PRELIM_DETECTION)
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp_prelim.cpp
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp_prelim.h
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp_gt.cpp
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp_hbm.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_ras_imp_prelim.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_ras_imp_prelim.h
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_ras_imp_gt.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_ras_imp_hbm.cpp
     )
   else()
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp.cpp
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp.h
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_ras_imp.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_ras_imp.h
     )
   endif()
 endif()
diff --git a/level_zero/sysman/source/ras/linux/os_ras_imp.cpp b/level_zero/sysman/source/ras/linux/sysman_os_ras_imp.cpp
similarity index 93%
rename from level_zero/sysman/source/ras/linux/os_ras_imp.cpp
rename to level_zero/sysman/source/ras/linux/sysman_os_ras_imp.cpp
index cf46fb603f..5251fdd114 100644
--- a/level_zero/sysman/source/ras/linux/os_ras_imp.cpp
+++ b/level_zero/sysman/source/ras/linux/sysman_os_ras_imp.cpp
@@ -5,9 +5,9 @@
  *
  */
 
-#include "level_zero/sysman/source/ras/linux/os_ras_imp.h"
+#include "level_zero/sysman/source/ras/linux/sysman_os_ras_imp.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 #include <cstring>
 
diff --git a/level_zero/sysman/source/ras/linux/os_ras_imp.h b/level_zero/sysman/source/ras/linux/sysman_os_ras_imp.h
similarity index 90%
rename from level_zero/sysman/source/ras/linux/os_ras_imp.h
rename to level_zero/sysman/source/ras/linux/sysman_os_ras_imp.h
index 1027748196..d571bc9f42 100644
--- a/level_zero/sysman/source/ras/linux/os_ras_imp.h
+++ b/level_zero/sysman/source/ras/linux/sysman_os_ras_imp.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/ras/os_ras.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/ras/sysman_os_ras.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/source/ras/linux/os_ras_imp_gt.cpp b/level_zero/sysman/source/ras/linux/sysman_os_ras_imp_gt.cpp
similarity index 99%
rename from level_zero/sysman/source/ras/linux/os_ras_imp_gt.cpp
rename to level_zero/sysman/source/ras/linux/sysman_os_ras_imp_gt.cpp
index 1a92bf4ae8..6c83417265 100644
--- a/level_zero/sysman/source/ras/linux/os_ras_imp_gt.cpp
+++ b/level_zero/sysman/source/ras/linux/sysman_os_ras_imp_gt.cpp
@@ -5,8 +5,8 @@
  *
  */
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/ras/linux/os_ras_imp_prelim.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
+#include "level_zero/sysman/source/ras/linux/sysman_os_ras_imp_prelim.h"
 
 #include <cstring>
 
diff --git a/level_zero/sysman/source/ras/linux/os_ras_imp_hbm.cpp b/level_zero/sysman/source/ras/linux/sysman_os_ras_imp_hbm.cpp
similarity index 90%
rename from level_zero/sysman/source/ras/linux/os_ras_imp_hbm.cpp
rename to level_zero/sysman/source/ras/linux/sysman_os_ras_imp_hbm.cpp
index cbcd796027..2ad951e944 100644
--- a/level_zero/sysman/source/ras/linux/os_ras_imp_hbm.cpp
+++ b/level_zero/sysman/source/ras/linux/sysman_os_ras_imp_hbm.cpp
@@ -7,9 +7,9 @@
 
 #include "shared/source/helpers/gfx_core_helper.h"
 
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/ras/linux/os_ras_imp_prelim.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
+#include "level_zero/sysman/source/ras/linux/sysman_os_ras_imp_prelim.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/ras/linux/os_ras_imp_prelim.cpp b/level_zero/sysman/source/ras/linux/sysman_os_ras_imp_prelim.cpp
similarity index 96%
rename from level_zero/sysman/source/ras/linux/os_ras_imp_prelim.cpp
rename to level_zero/sysman/source/ras/linux/sysman_os_ras_imp_prelim.cpp
index 68bb7044ef..0d8d7f5097 100644
--- a/level_zero/sysman/source/ras/linux/os_ras_imp_prelim.cpp
+++ b/level_zero/sysman/source/ras/linux/sysman_os_ras_imp_prelim.cpp
@@ -5,12 +5,12 @@
  *
  */
 
-#include "level_zero/sysman/source/ras/linux/os_ras_imp_prelim.h"
+#include "level_zero/sysman/source/ras/linux/sysman_os_ras_imp_prelim.h"
 
 #include "shared/source/helpers/string.h"
 #include "shared/source/os_interface/linux/system_info.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 #include "drm/intel_hwconfig_types.h"
 
diff --git a/level_zero/sysman/source/ras/linux/os_ras_imp_prelim.h b/level_zero/sysman/source/ras/linux/sysman_os_ras_imp_prelim.h
similarity index 95%
rename from level_zero/sysman/source/ras/linux/os_ras_imp_prelim.h
rename to level_zero/sysman/source/ras/linux/sysman_os_ras_imp_prelim.h
index 4a9d84caa4..bb0d16b732 100644
--- a/level_zero/sysman/source/ras/linux/os_ras_imp_prelim.h
+++ b/level_zero/sysman/source/ras/linux/sysman_os_ras_imp_prelim.h
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/pmu/pmu_imp.h"
-#include "level_zero/sysman/source/ras/os_ras.h"
+#include "level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/ras/sysman_os_ras.h"
 #include "level_zero/sysman/source/sysman_const.h"
 #include "level_zero/sysman/source/sysman_device_imp.h"
 
diff --git a/level_zero/sysman/source/ras/os_ras.h b/level_zero/sysman/source/ras/sysman_os_ras.h
similarity index 100%
rename from level_zero/sysman/source/ras/os_ras.h
rename to level_zero/sysman/source/ras/sysman_os_ras.h
diff --git a/level_zero/sysman/source/ras/ras.cpp b/level_zero/sysman/source/ras/sysman_ras.cpp
similarity index 97%
rename from level_zero/sysman/source/ras/ras.cpp
rename to level_zero/sysman/source/ras/sysman_ras.cpp
index 69b2f27f90..ebc861cf51 100644
--- a/level_zero/sysman/source/ras/ras.cpp
+++ b/level_zero/sysman/source/ras/sysman_ras.cpp
@@ -8,7 +8,7 @@
 #include "shared/source/helpers/basic_math.h"
 
 #include "level_zero/sysman/source/os_sysman.h"
-#include "level_zero/sysman/source/ras/ras_imp.h"
+#include "level_zero/sysman/source/ras/sysman_ras_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/ras/ras.h b/level_zero/sysman/source/ras/sysman_ras.h
similarity index 100%
rename from level_zero/sysman/source/ras/ras.h
rename to level_zero/sysman/source/ras/sysman_ras.h
diff --git a/level_zero/sysman/source/ras/ras_imp.cpp b/level_zero/sysman/source/ras/sysman_ras_imp.cpp
similarity index 95%
rename from level_zero/sysman/source/ras/ras_imp.cpp
rename to level_zero/sysman/source/ras/sysman_ras_imp.cpp
index b76ec247eb..62db08ac36 100644
--- a/level_zero/sysman/source/ras/ras_imp.cpp
+++ b/level_zero/sysman/source/ras/sysman_ras_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/ras/ras_imp.h"
+#include "level_zero/sysman/source/ras/sysman_ras_imp.h"
 
 #include "shared/source/helpers/string.h"
 
diff --git a/level_zero/sysman/source/ras/ras_imp.h b/level_zero/sysman/source/ras/sysman_ras_imp.h
similarity index 88%
rename from level_zero/sysman/source/ras/ras_imp.h
rename to level_zero/sysman/source/ras/sysman_ras_imp.h
index 8b14e70744..3717079f1a 100644
--- a/level_zero/sysman/source/ras/ras_imp.h
+++ b/level_zero/sysman/source/ras/sysman_ras_imp.h
@@ -9,8 +9,8 @@
 
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/ras/os_ras.h"
-#include "level_zero/sysman/source/ras/ras.h"
+#include "level_zero/sysman/source/ras/sysman_os_ras.h"
+#include "level_zero/sysman/source/ras/sysman_ras.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/ras/windows/CMakeLists.txt b/level_zero/sysman/source/ras/windows/CMakeLists.txt
index 2a3a5976b4..cb8f7be93d 100755
--- a/level_zero/sysman/source/ras/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/ras/windows/CMakeLists.txt
@@ -8,6 +8,6 @@ if(WIN32)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_ras_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_ras_imp.cpp
   )
 endif()
diff --git a/level_zero/sysman/source/ras/windows/os_ras_imp.cpp b/level_zero/sysman/source/ras/windows/sysman_os_ras_imp.cpp
similarity index 96%
rename from level_zero/sysman/source/ras/windows/os_ras_imp.cpp
rename to level_zero/sysman/source/ras/windows/sysman_os_ras_imp.cpp
index 89100278cb..3094e430f2 100644
--- a/level_zero/sysman/source/ras/windows/os_ras_imp.cpp
+++ b/level_zero/sysman/source/ras/windows/sysman_os_ras_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/ras/os_ras.h"
+#include "level_zero/sysman/source/ras/sysman_os_ras.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/scheduler/CMakeLists.txt b/level_zero/sysman/source/scheduler/CMakeLists.txt
index b60aaaab2d..12bb1ef8d8 100644
--- a/level_zero/sysman/source/scheduler/CMakeLists.txt
+++ b/level_zero/sysman/source/scheduler/CMakeLists.txt
@@ -7,11 +7,11 @@
 target_sources(${L0_STATIC_LIB_NAME}
                PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/scheduler.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/scheduler.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/scheduler_imp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/scheduler_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_scheduler.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_scheduler.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_scheduler.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_scheduler_imp.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_scheduler_imp.h
 )
 
 add_subdirectories()
diff --git a/level_zero/sysman/source/scheduler/linux/CMakeLists.txt b/level_zero/sysman/source/scheduler/linux/CMakeLists.txt
index 57fdc08a2a..7fcb10a2f6 100644
--- a/level_zero/sysman/source/scheduler/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/scheduler/linux/CMakeLists.txt
@@ -8,18 +8,18 @@ if(UNIX)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_scheduler_imp.h
   )
 
   if(NEO_ENABLE_i915_PRELIM_DETECTION)
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp_prelim.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_scheduler_imp_prelim.cpp
     )
   else()
     target_sources(${L0_STATIC_LIB_NAME}
                    PRIVATE
-                   ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp.cpp
+                   ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_scheduler_imp.cpp
     )
   endif()
 endif()
diff --git a/level_zero/sysman/source/scheduler/linux/os_scheduler_imp.cpp b/level_zero/sysman/source/scheduler/linux/sysman_os_scheduler_imp.cpp
similarity index 98%
rename from level_zero/sysman/source/scheduler/linux/os_scheduler_imp.cpp
rename to level_zero/sysman/source/scheduler/linux/sysman_os_scheduler_imp.cpp
index aae4571822..e29cca76cb 100644
--- a/level_zero/sysman/source/scheduler/linux/os_scheduler_imp.cpp
+++ b/level_zero/sysman/source/scheduler/linux/sysman_os_scheduler_imp.cpp
@@ -5,10 +5,10 @@
  *
  */
 
-#include "level_zero/sysman/source/scheduler/linux/os_scheduler_imp.h"
+#include "level_zero/sysman/source/scheduler/linux/sysman_os_scheduler_imp.h"
 
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/source/scheduler/linux/os_scheduler_imp.h b/level_zero/sysman/source/scheduler/linux/sysman_os_scheduler_imp.h
similarity index 95%
rename from level_zero/sysman/source/scheduler/linux/os_scheduler_imp.h
rename to level_zero/sysman/source/scheduler/linux/sysman_os_scheduler_imp.h
index a3bebf4b35..9b521c9556 100644
--- a/level_zero/sysman/source/scheduler/linux/os_scheduler_imp.h
+++ b/level_zero/sysman/source/scheduler/linux/sysman_os_scheduler_imp.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/os_interface/linux/drm_neo.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/scheduler/scheduler_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
+#include "level_zero/sysman/source/scheduler/sysman_scheduler_imp.h"
 
 #include <string>
 
diff --git a/level_zero/sysman/source/scheduler/linux/os_scheduler_imp_prelim.cpp b/level_zero/sysman/source/scheduler/linux/sysman_os_scheduler_imp_prelim.cpp
similarity index 99%
rename from level_zero/sysman/source/scheduler/linux/os_scheduler_imp_prelim.cpp
rename to level_zero/sysman/source/scheduler/linux/sysman_os_scheduler_imp_prelim.cpp
index bea328f0ff..35d595956a 100644
--- a/level_zero/sysman/source/scheduler/linux/os_scheduler_imp_prelim.cpp
+++ b/level_zero/sysman/source/scheduler/linux/sysman_os_scheduler_imp_prelim.cpp
@@ -9,9 +9,9 @@
 #include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915_prelim.h"
 
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/scheduler/linux/os_scheduler_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
+#include "level_zero/sysman/source/scheduler/linux/sysman_os_scheduler_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/source/scheduler/os_scheduler.h b/level_zero/sysman/source/scheduler/sysman_os_scheduler.h
similarity index 100%
rename from level_zero/sysman/source/scheduler/os_scheduler.h
rename to level_zero/sysman/source/scheduler/sysman_os_scheduler.h
diff --git a/level_zero/sysman/source/scheduler/scheduler.cpp b/level_zero/sysman/source/scheduler/sysman_scheduler.cpp
similarity index 97%
rename from level_zero/sysman/source/scheduler/scheduler.cpp
rename to level_zero/sysman/source/scheduler/sysman_scheduler.cpp
index 3065fb9df6..f9d9395f1a 100644
--- a/level_zero/sysman/source/scheduler/scheduler.cpp
+++ b/level_zero/sysman/source/scheduler/sysman_scheduler.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "level_zero/sysman/source/os_sysman.h"
-#include "level_zero/sysman/source/scheduler/scheduler_imp.h"
+#include "level_zero/sysman/source/scheduler/sysman_scheduler_imp.h"
 
 #include <algorithm>
 
diff --git a/level_zero/sysman/source/scheduler/scheduler.h b/level_zero/sysman/source/scheduler/sysman_scheduler.h
similarity index 100%
rename from level_zero/sysman/source/scheduler/scheduler.h
rename to level_zero/sysman/source/scheduler/sysman_scheduler.h
diff --git a/level_zero/sysman/source/scheduler/scheduler_imp.cpp b/level_zero/sysman/source/scheduler/sysman_scheduler_imp.cpp
similarity index 96%
rename from level_zero/sysman/source/scheduler/scheduler_imp.cpp
rename to level_zero/sysman/source/scheduler/sysman_scheduler_imp.cpp
index a08fd7a5ff..2bdda2f8b3 100644
--- a/level_zero/sysman/source/scheduler/scheduler_imp.cpp
+++ b/level_zero/sysman/source/scheduler/sysman_scheduler_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/scheduler/scheduler_imp.h"
+#include "level_zero/sysman/source/scheduler/sysman_scheduler_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 
diff --git a/level_zero/sysman/source/scheduler/scheduler_imp.h b/level_zero/sysman/source/scheduler/sysman_scheduler_imp.h
similarity index 91%
rename from level_zero/sysman/source/scheduler/scheduler_imp.h
rename to level_zero/sysman/source/scheduler/sysman_scheduler_imp.h
index 8357cf630d..b59fd1ced8 100644
--- a/level_zero/sysman/source/scheduler/scheduler_imp.h
+++ b/level_zero/sysman/source/scheduler/sysman_scheduler_imp.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/scheduler/os_scheduler.h"
-#include "level_zero/sysman/source/scheduler/scheduler.h"
+#include "level_zero/sysman/source/scheduler/sysman_os_scheduler.h"
+#include "level_zero/sysman/source/scheduler/sysman_scheduler.h"
 #include <level_zero/zes_api.h>
 
 namespace L0 {
diff --git a/level_zero/sysman/source/scheduler/windows/CMakeLists.txt b/level_zero/sysman/source/scheduler/windows/CMakeLists.txt
index 22c8912761..b93bf32bff 100644
--- a/level_zero/sysman/source/scheduler/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/scheduler/windows/CMakeLists.txt
@@ -8,7 +8,7 @@ if(WIN32)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_scheduler_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_scheduler_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_scheduler_imp.cpp
   )
 endif()
diff --git a/level_zero/sysman/source/scheduler/windows/os_scheduler_imp.cpp b/level_zero/sysman/source/scheduler/windows/sysman_os_scheduler_imp.cpp
similarity index 93%
rename from level_zero/sysman/source/scheduler/windows/os_scheduler_imp.cpp
rename to level_zero/sysman/source/scheduler/windows/sysman_os_scheduler_imp.cpp
index cfefe3cbd8..94ca78c44c 100644
--- a/level_zero/sysman/source/scheduler/windows/os_scheduler_imp.cpp
+++ b/level_zero/sysman/source/scheduler/windows/sysman_os_scheduler_imp.cpp
@@ -5,9 +5,9 @@
  *
  */
 
-#include "level_zero/sysman/source/scheduler/windows/os_scheduler_imp.h"
+#include "level_zero/sysman/source/scheduler/windows/sysman_os_scheduler_imp.h"
 
-#include "level_zero/sysman/source/scheduler/scheduler_imp.h"
+#include "level_zero/sysman/source/scheduler/sysman_scheduler_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/scheduler/windows/os_scheduler_imp.h b/level_zero/sysman/source/scheduler/windows/sysman_os_scheduler_imp.h
similarity index 93%
rename from level_zero/sysman/source/scheduler/windows/os_scheduler_imp.h
rename to level_zero/sysman/source/scheduler/windows/sysman_os_scheduler_imp.h
index 67a6feff25..78b70bfdc3 100644
--- a/level_zero/sysman/source/scheduler/windows/os_scheduler_imp.h
+++ b/level_zero/sysman/source/scheduler/windows/sysman_os_scheduler_imp.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/scheduler/scheduler_imp.h"
+#include "level_zero/sysman/source/scheduler/sysman_scheduler_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/standby/CMakeLists.txt b/level_zero/sysman/source/standby/CMakeLists.txt
index 3aa1dbf4ab..39f3130bf5 100644
--- a/level_zero/sysman/source/standby/CMakeLists.txt
+++ b/level_zero/sysman/source/standby/CMakeLists.txt
@@ -7,11 +7,11 @@
 target_sources(${L0_STATIC_LIB_NAME}
                PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/os_standby.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/standby.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/standby.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/standby_imp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/standby_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_standby.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_standby.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_standby.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_standby_imp.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_standby_imp.h
 )
 
 add_subdirectories()
diff --git a/level_zero/sysman/source/standby/linux/CMakeLists.txt b/level_zero/sysman/source/standby/linux/CMakeLists.txt
index 9d8de3bf8c..33a68c903c 100644
--- a/level_zero/sysman/source/standby/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/standby/linux/CMakeLists.txt
@@ -8,7 +8,7 @@ if(UNIX)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_standby_imp.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_standby_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_standby_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_standby_imp.h
   )
 endif()
diff --git a/level_zero/sysman/source/standby/linux/os_standby_imp.cpp b/level_zero/sysman/source/standby/linux/sysman_os_standby_imp.cpp
similarity index 97%
rename from level_zero/sysman/source/standby/linux/os_standby_imp.cpp
rename to level_zero/sysman/source/standby/linux/sysman_os_standby_imp.cpp
index d18e949a30..61c395f43b 100644
--- a/level_zero/sysman/source/standby/linux/os_standby_imp.cpp
+++ b/level_zero/sysman/source/standby/linux/sysman_os_standby_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/standby/linux/os_standby_imp.h"
+#include "level_zero/sysman/source/standby/linux/sysman_os_standby_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
diff --git a/level_zero/sysman/source/standby/linux/os_standby_imp.h b/level_zero/sysman/source/standby/linux/sysman_os_standby_imp.h
similarity index 80%
rename from level_zero/sysman/source/standby/linux/os_standby_imp.h
rename to level_zero/sysman/source/standby/linux/sysman_os_standby_imp.h
index 615b3287b9..27ecf8462a 100644
--- a/level_zero/sysman/source/standby/linux/os_standby_imp.h
+++ b/level_zero/sysman/source/standby/linux/sysman_os_standby_imp.h
@@ -8,10 +8,10 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/standby/os_standby.h"
-#include "level_zero/sysman/source/standby/standby_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
+#include "level_zero/sysman/source/standby/sysman_os_standby.h"
+#include "level_zero/sysman/source/standby/sysman_standby_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/standby/os_standby.h b/level_zero/sysman/source/standby/sysman_os_standby.h
similarity index 100%
rename from level_zero/sysman/source/standby/os_standby.h
rename to level_zero/sysman/source/standby/sysman_os_standby.h
diff --git a/level_zero/sysman/source/standby/standby.cpp b/level_zero/sysman/source/standby/sysman_standby.cpp
similarity index 92%
rename from level_zero/sysman/source/standby/standby.cpp
rename to level_zero/sysman/source/standby/sysman_standby.cpp
index 85c17859a9..18a3a84ccf 100644
--- a/level_zero/sysman/source/standby/standby.cpp
+++ b/level_zero/sysman/source/standby/sysman_standby.cpp
@@ -5,11 +5,11 @@
  *
  */
 
-#include "level_zero/sysman/source/standby/standby.h"
+#include "level_zero/sysman/source/standby/sysman_standby.h"
 
 #include "shared/source/helpers/basic_math.h"
 
-#include "level_zero/sysman/source/standby/standby_imp.h"
+#include "level_zero/sysman/source/standby/sysman_standby_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/standby/standby.h b/level_zero/sysman/source/standby/sysman_standby.h
similarity index 100%
rename from level_zero/sysman/source/standby/standby.h
rename to level_zero/sysman/source/standby/sysman_standby.h
diff --git a/level_zero/sysman/source/standby/standby_imp.cpp b/level_zero/sysman/source/standby/sysman_standby_imp.cpp
similarity index 96%
rename from level_zero/sysman/source/standby/standby_imp.cpp
rename to level_zero/sysman/source/standby/sysman_standby_imp.cpp
index 727223666d..cd893f2a42 100644
--- a/level_zero/sysman/source/standby/standby_imp.cpp
+++ b/level_zero/sysman/source/standby/sysman_standby_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "standby_imp.h"
+#include "sysman_standby_imp.h"
 
 #include "shared/source/helpers/debug_helpers.h"
 
diff --git a/level_zero/sysman/source/standby/standby_imp.h b/level_zero/sysman/source/standby/sysman_standby_imp.h
similarity index 87%
rename from level_zero/sysman/source/standby/standby_imp.h
rename to level_zero/sysman/source/standby/sysman_standby_imp.h
index 293d918bc0..fc9619f76b 100644
--- a/level_zero/sysman/source/standby/standby_imp.h
+++ b/level_zero/sysman/source/standby/sysman_standby_imp.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/standby/os_standby.h"
-#include "level_zero/sysman/source/standby/standby.h"
+#include "level_zero/sysman/source/standby/sysman_os_standby.h"
+#include "level_zero/sysman/source/standby/sysman_standby.h"
 #include <level_zero/zes_api.h>
 
 namespace L0 {
diff --git a/level_zero/sysman/source/standby/windows/CMakeLists.txt b/level_zero/sysman/source/standby/windows/CMakeLists.txt
index aa05b0891c..ed00852dc3 100644
--- a/level_zero/sysman/source/standby/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/standby/windows/CMakeLists.txt
@@ -8,6 +8,6 @@ if(WIN32)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_standby_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_standby_imp.cpp
   )
 endif()
diff --git a/level_zero/sysman/source/standby/windows/os_standby_imp.cpp b/level_zero/sysman/source/standby/windows/sysman_os_standby_imp.cpp
similarity index 94%
rename from level_zero/sysman/source/standby/windows/os_standby_imp.cpp
rename to level_zero/sysman/source/standby/windows/sysman_os_standby_imp.cpp
index 5b448d9a04..5a0ae7342e 100644
--- a/level_zero/sysman/source/standby/windows/os_standby_imp.cpp
+++ b/level_zero/sysman/source/standby/windows/sysman_os_standby_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/standby/os_standby.h"
+#include "level_zero/sysman/source/standby/sysman_os_standby.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/sysman_device.h b/level_zero/sysman/source/sysman_device.h
index a651523fd4..d037ffbb13 100644
--- a/level_zero/sysman/source/sysman_device.h
+++ b/level_zero/sysman/source/sysman_device.h
@@ -9,21 +9,21 @@
 #include "shared/source/execution_environment/execution_environment.h"
 
 #include "level_zero/core/source/device/device.h"
-#include "level_zero/sysman/source/diagnostics/diagnostics.h"
-#include "level_zero/sysman/source/ecc/ecc.h"
-#include "level_zero/sysman/source/engine/engine.h"
-#include "level_zero/sysman/source/fabric_port/fabric_port.h"
-#include "level_zero/sysman/source/firmware/firmware.h"
-#include "level_zero/sysman/source/frequency/frequency.h"
-#include "level_zero/sysman/source/global_operations/global_operations.h"
-#include "level_zero/sysman/source/memory/memory.h"
-#include "level_zero/sysman/source/pci/pci.h"
-#include "level_zero/sysman/source/performance/performance.h"
-#include "level_zero/sysman/source/power/power.h"
-#include "level_zero/sysman/source/ras/ras.h"
-#include "level_zero/sysman/source/scheduler/scheduler.h"
-#include "level_zero/sysman/source/standby/standby.h"
-#include "level_zero/sysman/source/temperature/temperature.h"
+#include "level_zero/sysman/source/diagnostics/sysman_diagnostics.h"
+#include "level_zero/sysman/source/ecc/sysman_ecc.h"
+#include "level_zero/sysman/source/engine/sysman_engine.h"
+#include "level_zero/sysman/source/fabric_port/sysman_fabric_port.h"
+#include "level_zero/sysman/source/firmware/sysman_firmware.h"
+#include "level_zero/sysman/source/frequency/sysman_frequency.h"
+#include "level_zero/sysman/source/global_operations/sysman_global_operations.h"
+#include "level_zero/sysman/source/memory/sysman_memory.h"
+#include "level_zero/sysman/source/pci/sysman_pci.h"
+#include "level_zero/sysman/source/performance/sysman_performance.h"
+#include "level_zero/sysman/source/power/sysman_power.h"
+#include "level_zero/sysman/source/ras/sysman_ras.h"
+#include "level_zero/sysman/source/scheduler/sysman_scheduler.h"
+#include "level_zero/sysman/source/standby/sysman_standby.h"
+#include "level_zero/sysman/source/temperature/sysman_temperature.h"
 #include <level_zero/ze_api.h>
 #include <level_zero/zes_api.h>
 
diff --git a/level_zero/sysman/source/sysman_device_imp.cpp b/level_zero/sysman/source/sysman_device_imp.cpp
index 4dfb4c26b4..44043a1e05 100644
--- a/level_zero/sysman/source/sysman_device_imp.cpp
+++ b/level_zero/sysman/source/sysman_device_imp.cpp
@@ -9,10 +9,10 @@
 
 #include "shared/source/helpers/debug_helpers.h"
 
-#include "level_zero/sysman/source/ecc/ecc_imp.h"
-#include "level_zero/sysman/source/global_operations/global_operations_imp.h"
+#include "level_zero/sysman/source/ecc/sysman_ecc_imp.h"
+#include "level_zero/sysman/source/global_operations/sysman_global_operations_imp.h"
 #include "level_zero/sysman/source/os_sysman.h"
-#include "level_zero/sysman/source/pci/pci_imp.h"
+#include "level_zero/sysman/source/pci/sysman_pci_imp.h"
 
 #include <vector>
 
diff --git a/level_zero/sysman/source/temperature/CMakeLists.txt b/level_zero/sysman/source/temperature/CMakeLists.txt
index 75f83c35e9..be51453b32 100644
--- a/level_zero/sysman/source/temperature/CMakeLists.txt
+++ b/level_zero/sysman/source/temperature/CMakeLists.txt
@@ -7,11 +7,11 @@
 target_sources(${L0_STATIC_LIB_NAME}
                PRIVATE
                ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-               ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/temperature.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/temperature.h
-               ${CMAKE_CURRENT_SOURCE_DIR}/temperature_imp.cpp
-               ${CMAKE_CURRENT_SOURCE_DIR}/temperature_imp.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_temperature.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_temperature.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_temperature.h
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_temperature_imp.cpp
+               ${CMAKE_CURRENT_SOURCE_DIR}/sysman_temperature_imp.h
 )
 
 add_subdirectories()
diff --git a/level_zero/sysman/source/temperature/linux/CMakeLists.txt b/level_zero/sysman/source/temperature/linux/CMakeLists.txt
index 9eb8667664..e177019c9c 100644
--- a/level_zero/sysman/source/temperature/linux/CMakeLists.txt
+++ b/level_zero/sysman/source/temperature/linux/CMakeLists.txt
@@ -8,7 +8,7 @@ if(UNIX)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature_imp.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_temperature_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_temperature_imp.h
   )
 endif()
diff --git a/level_zero/sysman/source/temperature/linux/os_temperature_imp.cpp b/level_zero/sysman/source/temperature/linux/sysman_os_temperature_imp.cpp
similarity index 98%
rename from level_zero/sysman/source/temperature/linux/os_temperature_imp.cpp
rename to level_zero/sysman/source/temperature/linux/sysman_os_temperature_imp.cpp
index 93f3fe4f11..6bb4773750 100644
--- a/level_zero/sysman/source/temperature/linux/os_temperature_imp.cpp
+++ b/level_zero/sysman/source/temperature/linux/sysman_os_temperature_imp.cpp
@@ -5,11 +5,11 @@
  *
  */
 
-#include "level_zero/sysman/source/temperature/linux/os_temperature_imp.h"
+#include "level_zero/sysman/source/temperature/linux/sysman_os_temperature_imp.h"
 
 #include "shared/source/debug_settings/debug_settings_manager.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/temperature/linux/os_temperature_imp.h b/level_zero/sysman/source/temperature/linux/sysman_os_temperature_imp.h
similarity index 88%
rename from level_zero/sysman/source/temperature/linux/os_temperature_imp.h
rename to level_zero/sysman/source/temperature/linux/sysman_os_temperature_imp.h
index 69f055dbab..6a26d0c786 100644
--- a/level_zero/sysman/source/temperature/linux/os_temperature_imp.h
+++ b/level_zero/sysman/source/temperature/linux/sysman_os_temperature_imp.h
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/pmt/pmt.h"
-#include "level_zero/sysman/source/temperature/os_temperature.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/temperature/sysman_os_temperature.h"
 
 #include "igfxfmid.h"
 
diff --git a/level_zero/sysman/source/temperature/os_temperature.h b/level_zero/sysman/source/temperature/sysman_os_temperature.h
similarity index 100%
rename from level_zero/sysman/source/temperature/os_temperature.h
rename to level_zero/sysman/source/temperature/sysman_os_temperature.h
diff --git a/level_zero/sysman/source/temperature/temperature.cpp b/level_zero/sysman/source/temperature/sysman_temperature.cpp
similarity index 96%
rename from level_zero/sysman/source/temperature/temperature.cpp
rename to level_zero/sysman/source/temperature/sysman_temperature.cpp
index a749291196..7621153e1b 100644
--- a/level_zero/sysman/source/temperature/temperature.cpp
+++ b/level_zero/sysman/source/temperature/sysman_temperature.cpp
@@ -8,7 +8,7 @@
 #include "shared/source/helpers/basic_math.h"
 
 #include "level_zero/sysman/source/os_sysman.h"
-#include "level_zero/sysman/source/temperature/temperature_imp.h"
+#include "level_zero/sysman/source/temperature/sysman_temperature_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/temperature/temperature.h b/level_zero/sysman/source/temperature/sysman_temperature.h
similarity index 100%
rename from level_zero/sysman/source/temperature/temperature.h
rename to level_zero/sysman/source/temperature/sysman_temperature.h
diff --git a/level_zero/sysman/source/temperature/temperature_imp.cpp b/level_zero/sysman/source/temperature/sysman_temperature_imp.cpp
similarity index 94%
rename from level_zero/sysman/source/temperature/temperature_imp.cpp
rename to level_zero/sysman/source/temperature/sysman_temperature_imp.cpp
index 763bc5d288..79676e225b 100644
--- a/level_zero/sysman/source/temperature/temperature_imp.cpp
+++ b/level_zero/sysman/source/temperature/sysman_temperature_imp.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/temperature/temperature_imp.h"
+#include "level_zero/sysman/source/temperature/sysman_temperature_imp.h"
 
 #include "level_zero/sysman/source/sysman_device_imp.h"
 
diff --git a/level_zero/sysman/source/temperature/temperature_imp.h b/level_zero/sysman/source/temperature/sysman_temperature_imp.h
similarity index 86%
rename from level_zero/sysman/source/temperature/temperature_imp.h
rename to level_zero/sysman/source/temperature/sysman_temperature_imp.h
index 211c434a29..17cf68f40e 100644
--- a/level_zero/sysman/source/temperature/temperature_imp.h
+++ b/level_zero/sysman/source/temperature/sysman_temperature_imp.h
@@ -9,8 +9,8 @@
 
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/temperature/os_temperature.h"
-#include "level_zero/sysman/source/temperature/temperature.h"
+#include "level_zero/sysman/source/temperature/sysman_os_temperature.h"
+#include "level_zero/sysman/source/temperature/sysman_temperature.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/temperature/windows/CMakeLists.txt b/level_zero/sysman/source/temperature/windows/CMakeLists.txt
index 98194ab115..4dee4b78a8 100644
--- a/level_zero/sysman/source/temperature/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/temperature/windows/CMakeLists.txt
@@ -8,7 +8,7 @@ if(WIN32)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature_imp.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_temperature_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_temperature_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_os_temperature_imp.cpp
   )
 endif()
diff --git a/level_zero/sysman/source/temperature/windows/os_temperature_imp.cpp b/level_zero/sysman/source/temperature/windows/sysman_os_temperature_imp.cpp
similarity index 97%
rename from level_zero/sysman/source/temperature/windows/os_temperature_imp.cpp
rename to level_zero/sysman/source/temperature/windows/sysman_os_temperature_imp.cpp
index 554b68d22b..823e509239 100644
--- a/level_zero/sysman/source/temperature/windows/os_temperature_imp.cpp
+++ b/level_zero/sysman/source/temperature/windows/sysman_os_temperature_imp.cpp
@@ -5,9 +5,9 @@
  *
  */
 
-#include "level_zero/sysman/source/temperature/windows/os_temperature_imp.h"
+#include "level_zero/sysman/source/temperature/windows/sysman_os_temperature_imp.h"
 
-#include "level_zero/sysman/source/windows/kmd_sys_manager.h"
+#include "level_zero/sysman/source/windows/sysman_kmd_sys_manager.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/temperature/windows/os_temperature_imp.h b/level_zero/sysman/source/temperature/windows/sysman_os_temperature_imp.h
similarity index 86%
rename from level_zero/sysman/source/temperature/windows/os_temperature_imp.h
rename to level_zero/sysman/source/temperature/windows/sysman_os_temperature_imp.h
index 0572f78ed7..4aeb74a906 100644
--- a/level_zero/sysman/source/temperature/windows/os_temperature_imp.h
+++ b/level_zero/sysman/source/temperature/windows/sysman_os_temperature_imp.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/temperature/os_temperature.h"
-#include "level_zero/sysman/source/windows/os_sysman_imp.h"
+#include "level_zero/sysman/source/temperature/sysman_os_temperature.h"
+#include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/windows/CMakeLists.txt b/level_zero/sysman/source/windows/CMakeLists.txt
index 957cb47883..55db852839 100644
--- a/level_zero/sysman/source/windows/CMakeLists.txt
+++ b/level_zero/sysman/source/windows/CMakeLists.txt
@@ -8,11 +8,11 @@ if(WIN32)
   target_sources(${L0_STATIC_LIB_NAME}
                  PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/kmd_sys.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/kmd_sys_manager.h
-                 ${CMAKE_CURRENT_SOURCE_DIR}/os_sysman_imp.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/kmd_sys_manager.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_device_id_windows.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/zes_os_sysman_imp.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_kmd_sys.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_kmd_sys_manager.h
+                 ${CMAKE_CURRENT_SOURCE_DIR}/zes_os_sysman_imp.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_kmd_sys_manager.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/sysman_hw_device_id_windows.cpp
   )
 endif()
diff --git a/level_zero/sysman/source/windows/hw_device_id_windows.cpp b/level_zero/sysman/source/windows/sysman_hw_device_id_windows.cpp
similarity index 100%
rename from level_zero/sysman/source/windows/hw_device_id_windows.cpp
rename to level_zero/sysman/source/windows/sysman_hw_device_id_windows.cpp
diff --git a/level_zero/sysman/source/windows/kmd_sys.h b/level_zero/sysman/source/windows/sysman_kmd_sys.h
similarity index 100%
rename from level_zero/sysman/source/windows/kmd_sys.h
rename to level_zero/sysman/source/windows/sysman_kmd_sys.h
diff --git a/level_zero/sysman/source/windows/kmd_sys_manager.cpp b/level_zero/sysman/source/windows/sysman_kmd_sys_manager.cpp
similarity index 99%
rename from level_zero/sysman/source/windows/kmd_sys_manager.cpp
rename to level_zero/sysman/source/windows/sysman_kmd_sys_manager.cpp
index 116ecf702c..a4848eb19b 100644
--- a/level_zero/sysman/source/windows/kmd_sys_manager.cpp
+++ b/level_zero/sysman/source/windows/sysman_kmd_sys_manager.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/windows/kmd_sys_manager.h"
+#include "level_zero/sysman/source/windows/sysman_kmd_sys_manager.h"
 
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
diff --git a/level_zero/sysman/source/windows/kmd_sys_manager.h b/level_zero/sysman/source/windows/sysman_kmd_sys_manager.h
similarity index 95%
rename from level_zero/sysman/source/windows/kmd_sys_manager.h
rename to level_zero/sysman/source/windows/sysman_kmd_sys_manager.h
index 0401880de3..a4b0bb1715 100644
--- a/level_zero/sysman/source/windows/kmd_sys_manager.h
+++ b/level_zero/sysman/source/windows/sysman_kmd_sys_manager.h
@@ -9,7 +9,7 @@
 
 #include "shared/source/gmm_helper/gmm_lib.h"
 
-#include "level_zero/sysman/source/windows/kmd_sys.h"
+#include "level_zero/sysman/source/windows/sysman_kmd_sys.h"
 #include "level_zero/ze_api.h"
 
 #include <vector>
diff --git a/level_zero/sysman/source/windows/os_sysman_imp.cpp b/level_zero/sysman/source/windows/zes_os_sysman_imp.cpp
similarity index 92%
rename from level_zero/sysman/source/windows/os_sysman_imp.cpp
rename to level_zero/sysman/source/windows/zes_os_sysman_imp.cpp
index 49f6c25516..8eb7375e23 100644
--- a/level_zero/sysman/source/windows/os_sysman_imp.cpp
+++ b/level_zero/sysman/source/windows/zes_os_sysman_imp.cpp
@@ -5,14 +5,14 @@
  *
  */
 
-#include "level_zero/sysman/source/windows/os_sysman_imp.h"
+#include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 
 #include "shared/source/helpers/gfx_core_helper.h"
 #include "shared/source/os_interface/driver_info.h"
 #include "shared/source/os_interface/windows/wddm/wddm.h"
 
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
-#include "level_zero/sysman/source/windows/kmd_sys_manager.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
+#include "level_zero/sysman/source/windows/sysman_kmd_sys_manager.h"
 
 namespace L0 {
 namespace Sysman {
diff --git a/level_zero/sysman/source/windows/os_sysman_imp.h b/level_zero/sysman/source/windows/zes_os_sysman_imp.h
similarity index 88%
rename from level_zero/sysman/source/windows/os_sysman_imp.h
rename to level_zero/sysman/source/windows/zes_os_sysman_imp.h
index fd58e9de11..1cf3fa1194 100644
--- a/level_zero/sysman/source/windows/os_sysman_imp.h
+++ b/level_zero/sysman/source/windows/zes_os_sysman_imp.h
@@ -8,11 +8,11 @@
 #pragma once
 #include "shared/source/helpers/non_copyable_or_moveable.h"
 
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
 #include "level_zero/sysman/source/os_sysman.h"
 #include "level_zero/sysman/source/sysman_device.h"
 #include "level_zero/sysman/source/sysman_device_imp.h"
-#include "level_zero/sysman/source/windows/kmd_sys_manager.h"
+#include "level_zero/sysman/source/windows/sysman_kmd_sys_manager.h"
 
 namespace NEO {
 class Wddm;
diff --git a/level_zero/sysman/test/unit_tests/sources/ecc/linux/mock_ecc.h b/level_zero/sysman/test/unit_tests/sources/ecc/linux/mock_ecc.h
index ab79c0bc67..d1abb810d5 100644
--- a/level_zero/sysman/test/unit_tests/sources/ecc/linux/mock_ecc.h
+++ b/level_zero/sysman/test/unit_tests/sources/ecc/linux/mock_ecc.h
@@ -8,8 +8,8 @@
 #pragma once
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
-#include "level_zero/sysman/source/ecc/ecc_imp.h"
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
+#include "level_zero/sysman/source/ecc/sysman_ecc_imp.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine.h b/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine.h
index 57df0c45b2..6b41c3ed08 100644
--- a/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine.h
+++ b/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine.h
@@ -10,10 +10,10 @@
 #include "shared/source/os_interface/linux/i915.h"
 #include "shared/test/common/libult/linux/drm_mock.h"
 
-#include "level_zero/sysman/source/engine/engine_imp.h"
-#include "level_zero/sysman/source/engine/linux/os_engine_imp.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/linux/pmu/pmu_imp.h"
+#include "level_zero/sysman/source/engine/linux/sysman_os_engine_imp.h"
+#include "level_zero/sysman/source/engine/sysman_engine_imp.h"
+#include "level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
 
 using namespace NEO;
diff --git a/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine_prelim.h b/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine_prelim.h
index 703de2fd8a..b6973bab4f 100644
--- a/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/engine/linux/mock_engine_prelim.h
@@ -9,10 +9,10 @@
 #include "shared/source/os_interface/linux/engine_info.h"
 #include "shared/source/os_interface/linux/i915_prelim.h"
 
-#include "level_zero/sysman/source/engine/engine_imp.h"
-#include "level_zero/sysman/source/engine/linux/os_engine_imp.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/linux/pmu/pmu_imp.h"
+#include "level_zero/sysman/source/engine/linux/sysman_os_engine_imp.h"
+#include "level_zero/sysman/source/engine/sysman_engine_imp.h"
+#include "level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
 
 using namespace NEO;
diff --git a/level_zero/sysman/test/unit_tests/sources/engine/windows/test_zes_engine.cpp b/level_zero/sysman/test/unit_tests/sources/engine/windows/test_zes_engine.cpp
index b44c6aa9fa..1b82f086a9 100644
--- a/level_zero/sysman/test/unit_tests/sources/engine/windows/test_zes_engine.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/engine/windows/test_zes_engine.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/engine/windows/os_engine_imp.h"
+#include "level_zero/sysman/source/engine/windows/sysman_os_engine_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/engine/windows/mock_engine.h"
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h"
 
diff --git a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/mock_fabric_device.h b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/mock_fabric_device.h
index d22e989e37..a6ee7db500 100644
--- a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/mock_fabric_device.h
+++ b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/mock_fabric_device.h
@@ -9,9 +9,9 @@
 
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
-#include "level_zero/sysman/source/fabric_port/fabric_port.h"
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/fabric_port/sysman_fabric_port.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 
 #include "gmock/gmock.h"
 
diff --git a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_device_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_device_prelim.cpp
index 4288a4c249..557f9b6324 100644
--- a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_device_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_device_prelim.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/linux/fabric_device_access_imp.h"
+#include "level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h"
 
diff --git a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_port_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_port_prelim.cpp
index dcebbd59cf..73ecc84281 100644
--- a/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_port_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/fabric_port/linux/test_sysman_fabric_port_prelim.cpp
@@ -5,9 +5,9 @@
  *
  */
 
-#include "level_zero/sysman/source/fabric_port/fabric_port_imp.h"
-#include "level_zero/sysman/source/fabric_port/linux/fabric_device_access_imp.h"
-#include "level_zero/sysman/source/fabric_port/linux/os_fabric_port_imp_prelim.h"
+#include "level_zero/sysman/source/fabric_port/linux/sysman_fabric_device_access_imp.h"
+#include "level_zero/sysman/source/fabric_port/linux/sysman_os_fabric_port_imp_prelim.h"
+#include "level_zero/sysman/source/fabric_port/sysman_fabric_port_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/fabric_port/linux/mock_fabric_device.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h"
diff --git a/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware.h b/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware.h
index 54a44716d3..e3aa72db30 100644
--- a/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware.h
+++ b/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/firmware/linux/os_firmware_imp.h"
+#include "level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware_prelim.h b/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware_prelim.h
index a59e38816b..a5b6ec3521 100644
--- a/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/firmware/linux/mock_zes_sysman_firmware_prelim.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/firmware/linux/os_firmware_imp.h"
+#include "level_zero/sysman/source/firmware/linux/sysman_os_firmware_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h b/level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h
index c73c30085a..54a04ff956 100644
--- a/level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h
+++ b/level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h
@@ -10,7 +10,7 @@
 #include "shared/source/os_interface/os_library.h"
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
 
 #include "gmock/gmock.h"
 
diff --git a/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util.cpp b/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util.cpp
index 11d450ab88..d21edff583 100644
--- a/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util.cpp
@@ -8,7 +8,7 @@
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "level_zero/sysman/source/firmware_util/firmware_util_imp.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util_helper.cpp b/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util_helper.cpp
index bdca0d816f..65c425ab93 100644
--- a/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util_helper.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/firmware_util/test_fw_util_helper.cpp
@@ -8,7 +8,7 @@
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "level_zero/sysman/source/firmware_util/firmware_util_imp.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency.h b/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency.h
index 863c4678ce..f2a16ba105 100644
--- a/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency.h
+++ b/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
-#include "level_zero/sysman/source/frequency/linux/os_frequency_imp.h"
+#include "level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp.h"
 
 #include "gtest/gtest.h"
 
diff --git a/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency_prelim.h b/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency_prelim.h
index 0b611dede0..4233350874 100644
--- a/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/frequency/linux/mock_sysfs_frequency_prelim.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
-#include "level_zero/sysman/source/frequency/linux/os_frequency_imp_prelim.h"
+#include "level_zero/sysman/source/frequency/linux/sysman_os_frequency_imp_prelim.h"
 
 #include "gtest/gtest.h"
 #include "igfxfmid.h"
diff --git a/level_zero/sysman/test/unit_tests/sources/frequency/windows/mock_frequency.h b/level_zero/sysman/test/unit_tests/sources/frequency/windows/mock_frequency.h
index 4a7129f20f..78abecbd10 100644
--- a/level_zero/sysman/test/unit_tests/sources/frequency/windows/mock_frequency.h
+++ b/level_zero/sysman/test/unit_tests/sources/frequency/windows/mock_frequency.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/frequency/windows/os_frequency_imp.h"
+#include "level_zero/sysman/source/frequency/windows/sysman_os_frequency_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/frequency/windows/test_zes_frequency.cpp b/level_zero/sysman/test/unit_tests/sources/frequency/windows/test_zes_frequency.cpp
index 74d086eb6a..1f3af4e2d4 100644
--- a/level_zero/sysman/test/unit_tests/sources/frequency/windows/test_zes_frequency.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/frequency/windows/test_zes_frequency.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/frequency/windows/os_frequency_imp.h"
+#include "level_zero/sysman/source/frequency/windows/sysman_os_frequency_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
 #include "level_zero/sysman/test/unit_tests/sources/frequency/windows/mock_frequency.h"
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h"
diff --git a/level_zero/sysman/test/unit_tests/sources/global_operations/linux/mock_global_operations.h b/level_zero/sysman/test/unit_tests/sources/global_operations/linux/mock_global_operations.h
index 6cc1fcd857..37244ce38e 100644
--- a/level_zero/sysman/test/unit_tests/sources/global_operations/linux/mock_global_operations.h
+++ b/level_zero/sysman/test/unit_tests/sources/global_operations/linux/mock_global_operations.h
@@ -10,10 +10,10 @@
 #include "shared/test/common/mocks/mock_execution_environment.h"
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
-#include "level_zero/sysman/source/firmware_util/firmware_util.h"
-#include "level_zero/sysman/source/global_operations/global_operations_imp.h"
-#include "level_zero/sysman/source/global_operations/linux/os_global_operations_imp.h"
-#include "level_zero/sysman/source/linux/fs_access.h"
+#include "level_zero/sysman/source/firmware_util/sysman_firmware_util.h"
+#include "level_zero/sysman/source/global_operations/linux/sysman_os_global_operations_imp.h"
+#include "level_zero/sysman/source/global_operations/sysman_global_operations_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_drm.h b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_drm.h
index 98ffcc5621..1de6c47627 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_drm.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_drm.h
@@ -12,7 +12,7 @@
 #include "shared/source/os_interface/linux/drm_neo.h"
 #include "shared/source/os_interface/os_interface.h"
 
-#include "level_zero/sysman/source/linux/hw_device_id_linux.h"
+#include "level_zero/sysman/source/linux/sysman_hw_device_id_linux.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h
index 87e66a1cb8..75069fcdb0 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h
@@ -15,8 +15,8 @@
 #include "shared/test/common/test_macros/hw_test.h"
 
 #include "level_zero/core/test/unit_tests/fixtures/device_fixture.h"
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
 #include "level_zero/sysman/source/sysman_device.h"
 #include "level_zero/sysman/source/sysman_driver_handle_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h"
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h
index 5f8f673dc2..15e9698d82 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/linux/hw_device_id_linux.h"
+#include "level_zero/sysman/source/linux/sysman_hw_device_id_linux.h"
 
 #pragma once
 
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.cpp
index a3002118f5..1a84ff0954 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.cpp
@@ -7,7 +7,7 @@
 
 #include "level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h"
 
-#include "level_zero/sysman/source/linux/nl_api/iaf_nl_api.h"
+#include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h
index a83b18ffd4..a19b18dd0c 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_iaf_nl_api_prelim.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/linux/nl_api/iaf_nl_api.h"
+#include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
 
 #include "gmock/gmock.h"
 
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.cpp
index 8285378928..06b3801151 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.cpp
@@ -7,7 +7,7 @@
 
 #include "level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h"
 
-#include "level_zero/sysman/source/linux/nl_api/iaf_nl_api.h"
+#include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h
index 703d0bf4ed..7442b69219 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h
@@ -9,8 +9,8 @@
 
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
-#include "level_zero/sysman/source/linux/nl_api/iaf_nl_api.h"
-#include "level_zero/sysman/source/linux/nl_api/nl_api.h"
+#include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
+#include "level_zero/sysman/source/linux/nl_api/sysman_nl_api.h"
 
 #include "gmock/gmock.h"
 
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h
index a1ac5a0f31..a8d989f4c1 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_dll.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/os_interface/os_library.h"
 
-#include "level_zero/sysman/source/linux/nl_api/nl_api.h"
+#include "level_zero/sysman/source/linux/nl_api/sysman_nl_api.h"
 
 #include "gmock/gmock.h"
 
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
index 36c6159989..ee126bcfe8 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/nl_api/test_sysman_iaf_nl_api_prelim.cpp
@@ -8,7 +8,7 @@
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h"
 
-#include "level_zero/sysman/source/linux/nl_api/iaf_nl_api.h"
+#include "level_zero/sysman/source/linux/nl_api/sysman_iaf_nl_api.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/nl_api/mock_nl_api_prelim.h"
 
 #include "gmock/gmock.h"
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/pmt/mock_pmt.h b/level_zero/sysman/test/unit_tests/sources/linux/pmt/mock_pmt.h
index 6661c2502e..350390d2d3 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/pmt/mock_pmt.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/pmt/mock_pmt.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/linux/pmt/pmt.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/pmu/mock_pmu.h b/level_zero/sysman/test/unit_tests/sources/linux/pmu/mock_pmu.h
index da7737dda7..7c765fa683 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/pmu/mock_pmu.h
+++ b/level_zero/sysman/test/unit_tests/sources/linux/pmu/mock_pmu.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/linux/pmu/pmu_imp.h"
+#include "level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h"
 
 using namespace NEO;
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_hw_device_id.cpp b/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_hw_device_id.cpp
index c068c71c7a..476758afba 100644
--- a/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_hw_device_id.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/linux/test_sysman_hw_device_id.cpp
@@ -8,7 +8,7 @@
 #include "shared/test/common/helpers/variable_backup.h"
 #include "shared/test/common/os_interface/linux/sys_calls_linux_ult.h"
 
-#include "level_zero/sysman/source/linux/hw_device_id_linux.h"
+#include "level_zero/sysman/source/linux/sysman_hw_device_id_linux.h"
 
 #include "gtest/gtest.h"
 
diff --git a/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory.h b/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory.h
index bef95b08a8..b97fe92667 100644
--- a/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory.h
+++ b/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory.h
@@ -9,9 +9,9 @@
 #include "shared/source/os_interface/linux/i915.h"
 #include "shared/source/os_interface/linux/memory_info.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/memory/linux/os_memory_imp.h"
-#include "level_zero/sysman/source/memory/memory_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
+#include "level_zero/sysman/source/memory/linux/sysman_os_memory_imp.h"
+#include "level_zero/sysman/source/memory/sysman_memory_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
 
 using namespace NEO;
diff --git a/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory_prelim.h b/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory_prelim.h
index b0e00c0e86..cf90ba266f 100644
--- a/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory_prelim.h
@@ -10,9 +10,9 @@
 #include "shared/source/os_interface/linux/memory_info.h"
 #include "shared/source/os_interface/linux/system_info.h"
 
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/memory/linux/os_memory_imp_prelim.h"
-#include "level_zero/sysman/source/memory/memory_imp.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
+#include "level_zero/sysman/source/memory/linux/sysman_os_memory_imp_prelim.h"
+#include "level_zero/sysman/source/memory/sysman_memory_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
 
 #include "drm/i915_drm.h"
diff --git a/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_prelim.cpp b/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_prelim.cpp
index 60278c06ab..087f25868a 100644
--- a/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_prelim.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/memory/linux/test_sysman_memory_prelim.cpp
@@ -8,8 +8,8 @@
 #include "shared/source/os_interface/driver_info.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
-#include "level_zero/sysman/source/linux/pmt/pmt_xml_offsets.h"
-#include "level_zero/sysman/source/memory/linux/os_memory_imp_prelim.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt_xml_offsets.h"
+#include "level_zero/sysman/source/memory/linux/sysman_os_memory_imp_prelim.h"
 #include "level_zero/sysman/source/sysman_const.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 #include "level_zero/sysman/test/unit_tests/sources/memory/linux/mock_memory_prelim.h"
diff --git a/level_zero/sysman/test/unit_tests/sources/pci/linux/mock_sysfs_pci.h b/level_zero/sysman/test/unit_tests/sources/pci/linux/mock_sysfs_pci.h
index b3eeeddc22..03f6d990a4 100644
--- a/level_zero/sysman/test/unit_tests/sources/pci/linux/mock_sysfs_pci.h
+++ b/level_zero/sysman/test/unit_tests/sources/pci/linux/mock_sysfs_pci.h
@@ -6,9 +6,9 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/pci/linux/os_pci_imp.h"
-#include "level_zero/sysman/source/pci/pci_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/pci/linux/sysman_os_pci_imp.h"
+#include "level_zero/sysman/source/pci/sysman_pci_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance.h b/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance.h
index 3af84d8189..12e595a569 100644
--- a/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance.h
+++ b/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance.h
@@ -6,10 +6,10 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/performance/linux/os_performance_imp.h"
-#include "level_zero/sysman/source/performance/performance.h"
-#include "level_zero/sysman/source/performance/performance_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/performance/linux/sysman_os_performance_imp.h"
+#include "level_zero/sysman/source/performance/sysman_performance.h"
+#include "level_zero/sysman/source/performance/sysman_performance_imp.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance_prelim.h b/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance_prelim.h
index ac942980b5..9cc2129bad 100644
--- a/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/performance/linux/mock_sysfs_performance_prelim.h
@@ -6,10 +6,10 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/performance/linux/os_performance_imp_prelim.h"
-#include "level_zero/sysman/source/performance/performance.h"
-#include "level_zero/sysman/source/performance/performance_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/performance/linux/sysman_os_performance_imp_prelim.h"
+#include "level_zero/sysman/source/performance/sysman_performance.h"
+#include "level_zero/sysman/source/performance/sysman_performance_imp.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h b/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h
index d49d111a58..0ba54cb367 100644
--- a/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h
+++ b/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power.h
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/string.h"
 
-#include "level_zero/sysman/source/linux/pmt/pmt.h"
-#include "level_zero/sysman/source/power/linux/os_power_imp.h"
-#include "level_zero/sysman/source/power/power_imp.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
+#include "level_zero/sysman/source/power/linux/sysman_os_power_imp.h"
+#include "level_zero/sysman/source/power/sysman_power_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
 #include "level_zero/sysman/source/sysman_device_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
diff --git a/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h b/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h
index 93c90a08dd..d99ed85b3a 100644
--- a/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/power/linux/mock_sysfs_power_prelim.h
@@ -8,9 +8,9 @@
 #pragma once
 #include "shared/source/helpers/string.h"
 
-#include "level_zero/sysman/source/linux/pmt/pmt.h"
-#include "level_zero/sysman/source/power/linux/os_power_imp_prelim.h"
-#include "level_zero/sysman/source/power/power_imp.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
+#include "level_zero/sysman/source/power/linux/sysman_os_power_imp_prelim.h"
+#include "level_zero/sysman/source/power/sysman_power_imp.h"
 #include "level_zero/sysman/source/sysman_const.h"
 #include "level_zero/sysman/source/sysman_device_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
diff --git a/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras.h b/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras.h
index 4f90b242d1..95755295ff 100644
--- a/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras.h
+++ b/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras.h
@@ -6,10 +6,10 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/ras/linux/os_ras_imp.h"
-#include "level_zero/sysman/source/ras/ras.h"
-#include "level_zero/sysman/source/ras/ras_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/ras/linux/sysman_os_ras_imp.h"
+#include "level_zero/sysman/source/ras/sysman_ras.h"
+#include "level_zero/sysman/source/ras/sysman_ras_imp.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras_prelim.h b/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras_prelim.h
index e7e6d66161..500416a126 100644
--- a/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/ras/linux/mock_fs_ras_prelim.h
@@ -9,12 +9,12 @@
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 #include "shared/source/os_interface/linux/system_info.h"
 
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/os_sysman_imp.h"
-#include "level_zero/sysman/source/linux/pmu/pmu_imp.h"
-#include "level_zero/sysman/source/ras/linux/os_ras_imp_prelim.h"
-#include "level_zero/sysman/source/ras/ras.h"
-#include "level_zero/sysman/source/ras/ras_imp.h"
+#include "level_zero/sysman/source/linux/pmu/sysman_pmu_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/linux/zes_os_sysman_imp.h"
+#include "level_zero/sysman/source/ras/linux/sysman_os_ras_imp_prelim.h"
+#include "level_zero/sysman/source/ras/sysman_ras.h"
+#include "level_zero/sysman/source/ras/sysman_ras_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
 
 #include "drm/intel_hwconfig_types.h"
diff --git a/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler.h b/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler.h
index a90863d9d1..d4151b1478 100644
--- a/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler.h
+++ b/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler.h
@@ -6,8 +6,8 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/scheduler/linux/os_scheduler_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/scheduler/linux/sysman_os_scheduler_imp.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler_prelim.h b/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler_prelim.h
index 533075a32d..dd8767f554 100644
--- a/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler_prelim.h
+++ b/level_zero/sysman/test/unit_tests/sources/scheduler/linux/mock_sysfs_scheduler_prelim.h
@@ -11,8 +11,8 @@
 #include "shared/source/os_interface/linux/i915_prelim.h"
 #include "shared/source/os_interface/linux/ioctl_helper.h"
 
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/scheduler/linux/os_scheduler_imp.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/scheduler/linux/sysman_os_scheduler_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_hw_device_id.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/standby/linux/mock_sysfs_standby.h b/level_zero/sysman/test/unit_tests/sources/standby/linux/mock_sysfs_standby.h
index f0447423b4..e6190e01f8 100644
--- a/level_zero/sysman/test/unit_tests/sources/standby/linux/mock_sysfs_standby.h
+++ b/level_zero/sysman/test/unit_tests/sources/standby/linux/mock_sysfs_standby.h
@@ -9,7 +9,7 @@
 
 #include "shared/test/common/test_macros/mock_method_macros.h"
 
-#include "level_zero/sysman/source/standby/linux/os_standby_imp.h"
+#include "level_zero/sysman/source/standby/linux/sysman_os_standby_imp.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/sysman/test/unit_tests/sources/temperature/linux/mock_sysfs_temperature.h b/level_zero/sysman/test/unit_tests/sources/temperature/linux/mock_sysfs_temperature.h
index 3f9322cfb2..a6a803a7bc 100644
--- a/level_zero/sysman/test/unit_tests/sources/temperature/linux/mock_sysfs_temperature.h
+++ b/level_zero/sysman/test/unit_tests/sources/temperature/linux/mock_sysfs_temperature.h
@@ -6,10 +6,10 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/linux/fs_access.h"
-#include "level_zero/sysman/source/linux/pmt/pmt.h"
-#include "level_zero/sysman/source/temperature/linux/os_temperature_imp.h"
-#include "level_zero/sysman/source/temperature/temperature_imp.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt.h"
+#include "level_zero/sysman/source/linux/sysman_fs_access.h"
+#include "level_zero/sysman/source/temperature/linux/sysman_os_temperature_imp.h"
+#include "level_zero/sysman/source/temperature/sysman_temperature_imp.h"
 
 namespace L0 {
 namespace ult {
diff --git a/level_zero/sysman/test/unit_tests/sources/temperature/linux/test_zes_temperature.cpp b/level_zero/sysman/test/unit_tests/sources/temperature/linux/test_zes_temperature.cpp
index ea15214f96..170764f501 100644
--- a/level_zero/sysman/test/unit_tests/sources/temperature/linux/test_zes_temperature.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/temperature/linux/test_zes_temperature.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/linux/pmt/pmt_xml_offsets.h"
+#include "level_zero/sysman/source/linux/pmt/sysman_pmt_xml_offsets.h"
 #include "level_zero/sysman/test/unit_tests/sources/linux/mock_sysman_fixture.h"
 #include "level_zero/sysman/test/unit_tests/sources/temperature/linux/mock_sysfs_temperature.h"
 
diff --git a/level_zero/sysman/test/unit_tests/sources/temperature/windows/mock_temperature.h b/level_zero/sysman/test/unit_tests/sources/temperature/windows/mock_temperature.h
index 0829a82db8..9b0dc2ddb8 100644
--- a/level_zero/sysman/test/unit_tests/sources/temperature/windows/mock_temperature.h
+++ b/level_zero/sysman/test/unit_tests/sources/temperature/windows/mock_temperature.h
@@ -6,7 +6,7 @@
  */
 
 #pragma once
-#include "level_zero/sysman/source/temperature/temperature_imp.h"
+#include "level_zero/sysman/source/temperature/sysman_temperature_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/temperature/windows/test_zes_temperature.cpp b/level_zero/sysman/test/unit_tests/sources/temperature/windows/test_zes_temperature.cpp
index db7b9c7f95..ffb8b53665 100644
--- a/level_zero/sysman/test/unit_tests/sources/temperature/windows/test_zes_temperature.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/temperature/windows/test_zes_temperature.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/temperature/windows/os_temperature_imp.h"
+#include "level_zero/sysman/source/temperature/windows/sysman_os_temperature_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/temperature/windows/mock_temperature.h"
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h"
 
diff --git a/level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h b/level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h
index 8992da73c4..1d630baab4 100644
--- a/level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h
+++ b/level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include "level_zero/sysman/source/windows/kmd_sys_manager.h"
+#include "level_zero/sysman/source/windows/sysman_kmd_sys_manager.h"
 #include "level_zero/zes_api.h"
 
 namespace L0 {
diff --git a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h
index 52e52dd5df..aa12da2299 100644
--- a/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h
+++ b/level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_fixture.h
@@ -10,7 +10,7 @@
 #include "shared/test/common/helpers/default_hw_info.h"
 
 #include "level_zero/sysman/source/sysman_driver_handle_imp.h"
-#include "level_zero/sysman/source/windows/os_sysman_imp.h"
+#include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/firmware_util/mock_fw_util_fixture.h"
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_sysman_wddm.h"
 
diff --git a/level_zero/sysman/test/unit_tests/sources/windows/test_sysman_manager.cpp b/level_zero/sysman/test/unit_tests/sources/windows/test_sysman_manager.cpp
index 5648186860..6ebbdf6f3b 100644
--- a/level_zero/sysman/test/unit_tests/sources/windows/test_sysman_manager.cpp
+++ b/level_zero/sysman/test/unit_tests/sources/windows/test_sysman_manager.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "level_zero/sysman/source/windows/os_sysman_imp.h"
+#include "level_zero/sysman/source/windows/zes_os_sysman_imp.h"
 #include "level_zero/sysman/test/unit_tests/sources/windows/mock_kmd_sys_manager.h"
 
 #include "gtest/gtest.h"