diff --git a/level_zero/core/source/device/device_imp.cpp b/level_zero/core/source/device/device_imp.cpp
index 35666b9f12..d4233299c6 100644
--- a/level_zero/core/source/device/device_imp.cpp
+++ b/level_zero/core/source/device/device_imp.cpp
@@ -664,7 +664,7 @@ ze_result_t DeviceImp::getP2PProperties(ze_device_handle_t hPeerDevice,
 
 ze_result_t DeviceImp::getRootDevice(ze_device_handle_t *phRootDevice) {
     // Given FLAT device Hierarchy mode, then nullptr is returned for the root device since no traversal is allowed.
-    if (this->neoDevice->getExecutionEnvironment()->getDeviceHierarchyMode() == NEO::DeviceHierarchyMode::FLAT) {
+    if (this->neoDevice->getExecutionEnvironment()->getDeviceHierarchyMode() == NEO::DeviceHierarchyMode::flat) {
         *phRootDevice = nullptr;
         return ZE_RESULT_SUCCESS;
     }
@@ -1005,7 +1005,7 @@ ze_result_t DeviceImp::getProperties(ze_device_properties_t *pDeviceProperties)
         pDeviceProperties->flags |= ZE_DEVICE_PROPERTY_FLAG_INTEGRATED;
     }
 
-    if (isSubdevice && this->neoDevice->getExecutionEnvironment()->getDeviceHierarchyMode() != NEO::DeviceHierarchyMode::FLAT) {
+    if (isSubdevice && this->neoDevice->getExecutionEnvironment()->getDeviceHierarchyMode() != NEO::DeviceHierarchyMode::flat) {
         pDeviceProperties->flags |= ZE_DEVICE_PROPERTY_FLAG_SUBDEVICE;
     }
 
@@ -1195,7 +1195,7 @@ ze_result_t DeviceImp::getGlobalTimestampsUsingOsInterface(uint64_t *hostTimesta
 
 ze_result_t DeviceImp::getSubDevices(uint32_t *pCount, ze_device_handle_t *phSubdevices) {
     // Given FLAT device Hierarchy mode, then a count of 0 is returned since no traversal is allowed.
-    if (this->neoDevice->getExecutionEnvironment()->getDeviceHierarchyMode() == NEO::DeviceHierarchyMode::FLAT) {
+    if (this->neoDevice->getExecutionEnvironment()->getDeviceHierarchyMode() == NEO::DeviceHierarchyMode::flat) {
         *pCount = 0;
         return ZE_RESULT_SUCCESS;
     }
diff --git a/level_zero/core/source/driver/driver_handle_imp.cpp b/level_zero/core/source/driver/driver_handle_imp.cpp
index f9e011362b..9cedcb1a64 100644
--- a/level_zero/core/source/driver/driver_handle_imp.cpp
+++ b/level_zero/core/source/driver/driver_handle_imp.cpp
@@ -330,7 +330,7 @@ void DriverHandleImp::initHostUsmAllocPool() {
 ze_result_t DriverHandleImp::getDevice(uint32_t *pCount, ze_device_handle_t *phDevices) {
 
     // If the user has requested FLAT or COMBINED device hierarchy model, then report all the sub devices as devices.
-    bool exposeSubDevices = (this->devices.size() && this->devices[0]->getNEODevice()->getExecutionEnvironment()->getDeviceHierarchyMode() != NEO::DeviceHierarchyMode::COMPOSITE);
+    bool exposeSubDevices = (this->devices.size() && this->devices[0]->getNEODevice()->getExecutionEnvironment()->getDeviceHierarchyMode() != NEO::DeviceHierarchyMode::composite);
 
     uint32_t numDevices = 0;
     if (exposeSubDevices) {
@@ -858,7 +858,7 @@ ze_result_t DriverHandleImp::fabricVertexGetExp(uint32_t *pCount, ze_fabric_vert
         this->initializeVertexes();
     }
 
-    bool exposeSubDevices = this->devices[0]->getNEODevice()->getExecutionEnvironment()->getDeviceHierarchyMode() != NEO::DeviceHierarchyMode::COMPOSITE;
+    bool exposeSubDevices = this->devices[0]->getNEODevice()->getExecutionEnvironment()->getDeviceHierarchyMode() != NEO::DeviceHierarchyMode::composite;
 
     if (*pCount == 0) {
         if (exposeSubDevices) {
diff --git a/level_zero/core/test/unit_tests/fixtures/device_fixture.h b/level_zero/core/test/unit_tests/fixtures/device_fixture.h
index 4892c3fc3b..597a070a09 100644
--- a/level_zero/core/test/unit_tests/fixtures/device_fixture.h
+++ b/level_zero/core/test/unit_tests/fixtures/device_fixture.h
@@ -130,7 +130,7 @@ struct MultiDeviceFixture {
     uint32_t numRootDevices = 4u;
     uint32_t numSubDevices = 2u;
     L0::ContextImp *context = nullptr;
-    NEO::DeviceHierarchyMode deviceHierarchyMode = NEO::DeviceHierarchyMode::COMPOSITE;
+    NEO::DeviceHierarchyMode deviceHierarchyMode = NEO::DeviceHierarchyMode::composite;
 
     VariableBackup<_ze_driver_handle_t *> globalDriverHandleBackup{&globalDriverHandle};
     VariableBackup<uint32_t> driverCountBackup{&driverCount};
@@ -144,14 +144,14 @@ struct MultiDeviceFixtureCompositeHierarchy : public MultiDeviceFixtureHierarchy
 
 struct MultiDeviceFixtureFlatHierarchy : public MultiDeviceFixtureHierarchy {
     void setUp() {
-        this->deviceHierarchyMode = NEO::DeviceHierarchyMode::FLAT;
+        this->deviceHierarchyMode = NEO::DeviceHierarchyMode::flat;
         MultiDeviceFixtureHierarchy::setUp();
     }
 };
 
 struct MultiDeviceFixtureCombinedHierarchy : public MultiDeviceFixtureHierarchy {
     void setUp() {
-        this->deviceHierarchyMode = NEO::DeviceHierarchyMode::COMBINED;
+        this->deviceHierarchyMode = NEO::DeviceHierarchyMode::combined;
         MultiDeviceFixtureHierarchy::setUp();
     }
 };
diff --git a/level_zero/core/test/unit_tests/sources/device/test_device_pci_bus_info.cpp b/level_zero/core/test/unit_tests/sources/device/test_device_pci_bus_info.cpp
index 9495befc9d..9c760b66e3 100644
--- a/level_zero/core/test/unit_tests/sources/device/test_device_pci_bus_info.cpp
+++ b/level_zero/core/test/unit_tests/sources/device/test_device_pci_bus_info.cpp
@@ -76,7 +76,7 @@ TEST_P(PciBusOrderingTest, givenMultipleDevicesWithCompositeHierarchyAndZePcieId
     debugManager.flags.EnableChipsetUniqueUUID.set(0);
 
     auto executionEnvironment = NEO::MockDevice::prepareExecutionEnvironment(defaultHwInfo.get(), 0u);
-    executionEnvironment->setDeviceHierarchyMode(COMPOSITE);
+    executionEnvironment->setDeviceHierarchyMode(DeviceHierarchyMode::composite);
     auto memoryManager = new MockMemoryManagerOsAgnosticContext(*executionEnvironment);
     executionEnvironment->memoryManager.reset(memoryManager);
     auto neoDevices = NEO::DeviceFactory::createDevices(*executionEnvironment);
diff --git a/level_zero/core/test/unit_tests/sources/event/test_event.cpp b/level_zero/core/test/unit_tests/sources/event/test_event.cpp
index 08580afc6d..d723602fb2 100644
--- a/level_zero/core/test/unit_tests/sources/event/test_event.cpp
+++ b/level_zero/core/test/unit_tests/sources/event/test_event.cpp
@@ -4311,7 +4311,7 @@ struct EventDynamicPacketUseFixture : public DeviceFixture {
     void testSingleDevice() {
         ze_result_t result = ZE_RESULT_SUCCESS;
 
-        device->getNEODevice()->getExecutionEnvironment()->setDeviceHierarchyMode(COMPOSITE);
+        device->getNEODevice()->getExecutionEnvironment()->setDeviceHierarchyMode(DeviceHierarchyMode::composite);
 
         auto &hwInfo = device->getHwInfo();
         auto &l0GfxCoreHelper = device->getNEODevice()->getRootDeviceEnvironment().getHelper<L0GfxCoreHelper>();
diff --git a/level_zero/tools/test/unit_tests/sources/sysman/mocks/test_sysman_device_info.cpp b/level_zero/tools/test/unit_tests/sources/sysman/mocks/test_sysman_device_info.cpp
index 44a69a6538..cdc3e04c59 100644
--- a/level_zero/tools/test/unit_tests/sources/sysman/mocks/test_sysman_device_info.cpp
+++ b/level_zero/tools/test/unit_tests/sources/sysman/mocks/test_sysman_device_info.cpp
@@ -35,7 +35,7 @@ TEST_F(SysmanMultiDeviceInfoFixture, givenDeviceWithMultipleTilesWhenOnlyTileOne
 }
 
 TEST_F(SysmanMultiDeviceInfoFixture, givenDeviceWithMultipleTilesEnabledAndCompositeHierarchyThenGetSysmanDeviceInfoReturnsExpectedValues) {
-    neoDevice->getExecutionEnvironment()->setDeviceHierarchyMode(NEO::DeviceHierarchyMode::COMPOSITE);
+    neoDevice->getExecutionEnvironment()->setDeviceHierarchyMode(NEO::DeviceHierarchyMode::composite);
     uint32_t subDeviceCount = 0;
     std::vector<ze_device_handle_t> deviceHandles;
     Device::fromHandle(device->toHandle())->getSubDevices(&subDeviceCount, nullptr);
diff --git a/opencl/source/api/api.cpp b/opencl/source/api/api.cpp
index edcf16e9d0..2a315788b9 100644
--- a/opencl/source/api/api.cpp
+++ b/opencl/source/api/api.cpp
@@ -259,7 +259,7 @@ cl_int CL_API_CALL clGetDeviceIDs(cl_platform_id platform,
 
         cl_uint retNum = 0;
         for (auto platformDeviceIndex = 0u; platformDeviceIndex < numDev; platformDeviceIndex++) {
-            bool exposeSubDevices = pPlatform->peekExecutionEnvironment()->getDeviceHierarchyMode() != COMPOSITE;
+            bool exposeSubDevices = pPlatform->peekExecutionEnvironment()->getDeviceHierarchyMode() != DeviceHierarchyMode::composite;
 
             ClDevice *device = pPlatform->getClDevice(platformDeviceIndex);
             UNRECOVERABLE_IF(device == nullptr);
diff --git a/opencl/source/cl_device/cl_device.cpp b/opencl/source/cl_device/cl_device.cpp
index badb5470b6..8e7f1a4bd7 100644
--- a/opencl/source/cl_device/cl_device.cpp
+++ b/opencl/source/cl_device/cl_device.cpp
@@ -51,7 +51,7 @@ ClDevice::ClDevice(Device &device, ClDevice &rootClDevice, Platform *platform) :
         pClSubDevice->decRefApi();
         pClSubDevice->internalParentDevice = this;
 
-        if (device.getExecutionEnvironment()->getDeviceHierarchyMode() == COMPOSITE) {
+        if (device.getExecutionEnvironment()->getDeviceHierarchyMode() == DeviceHierarchyMode::composite) {
             auto &deviceInfo = pClSubDevice->deviceInfo;
             deviceInfo.parentDevice = this;
             deviceInfo.partitionType[0] = CL_DEVICE_PARTITION_BY_AFFINITY_DOMAIN;
diff --git a/opencl/test/unit_test/device/sub_device_tests.cpp b/opencl/test/unit_test/device/sub_device_tests.cpp
index 6beda2a18e..7548ec6fbc 100644
--- a/opencl/test/unit_test/device/sub_device_tests.cpp
+++ b/opencl/test/unit_test/device/sub_device_tests.cpp
@@ -110,7 +110,7 @@ TEST(SubDevicesTest, givenDeviceWithFlatOrCombinedHierarchyWhenSubDeviceApiRefCo
     UnitTestSetter::disableHeaplessStateInit(restorer);
     VariableBackup<bool> mockDeviceFlagBackup(&MockDevice::createSingleDevice, false);
 
-    DeviceHierarchyMode deviceHierarchyModes[] = {FLAT, COMBINED};
+    DeviceHierarchyMode deviceHierarchyModes[] = {DeviceHierarchyMode::flat, DeviceHierarchyMode::combined};
     for (auto deviceHierarchyMode : deviceHierarchyModes) {
         initPlatform();
         platform()->peekExecutionEnvironment()->setDeviceHierarchyMode(deviceHierarchyMode);
diff --git a/shared/source/device/device.cpp b/shared/source/device/device.cpp
index 7b5e25a2dc..d939b59038 100644
--- a/shared/source/device/device.cpp
+++ b/shared/source/device/device.cpp
@@ -93,7 +93,7 @@ bool Device::genericSubDevicesAllowed() {
     deviceBitfield = maxNBitValue(subDeviceCount);
     deviceBitfield &= deviceMask;
     numSubDevices = static_cast<uint32_t>(deviceBitfield.count());
-    if (numSubDevices == 1 && (executionEnvironment->getDeviceHierarchyMode() != COMBINED || subDeviceCount == 1)) {
+    if (numSubDevices == 1 && (executionEnvironment->getDeviceHierarchyMode() != DeviceHierarchyMode::combined || subDeviceCount == 1)) {
         numSubDevices = 0;
     }
 
diff --git a/shared/source/execution_environment/execution_environment.cpp b/shared/source/execution_environment/execution_environment.cpp
index 0b0f176792..26580406ef 100644
--- a/shared/source/execution_environment/execution_environment.cpp
+++ b/shared/source/execution_environment/execution_environment.cpp
@@ -220,7 +220,7 @@ void ExecutionEnvironment::parseAffinityMask() {
     }
 
     // If the user has requested FLAT or COMBINED device hierarchy models, then report all the sub devices as devices.
-    bool exposeSubDevices = this->deviceHierarchyMode != COMPOSITE;
+    bool exposeSubDevices = this->deviceHierarchyMode != DeviceHierarchyMode::composite;
 
     // Reserve at least for a size equal to rootDeviceEnvironments.size() times four,
     // which is enough for typical configurations
@@ -316,11 +316,11 @@ void ExecutionEnvironment::setDeviceHierarchyMode(const GfxCoreHelper &gfxCoreHe
     NEO::EnvironmentVariableReader envReader;
     std::string deviceHierarchyMode = envReader.getSetting("ZE_FLAT_DEVICE_HIERARCHY", std::string(""));
     if (strcmp(deviceHierarchyMode.c_str(), "COMPOSITE") == 0) {
-        this->deviceHierarchyMode = COMPOSITE;
+        this->deviceHierarchyMode = DeviceHierarchyMode::composite;
     } else if (strcmp(deviceHierarchyMode.c_str(), "FLAT") == 0) {
-        this->deviceHierarchyMode = FLAT;
+        this->deviceHierarchyMode = DeviceHierarchyMode::flat;
     } else if (strcmp(deviceHierarchyMode.c_str(), "COMBINED") == 0) {
-        this->deviceHierarchyMode = COMBINED;
+        this->deviceHierarchyMode = DeviceHierarchyMode::combined;
     } else {
         this->deviceHierarchyMode = gfxCoreHelper.getDefaultDeviceHierarchy();
     }
diff --git a/shared/source/execution_environment/execution_environment.h b/shared/source/execution_environment/execution_environment.h
index c448e09af3..5d8dc15995 100644
--- a/shared/source/execution_environment/execution_environment.h
+++ b/shared/source/execution_environment/execution_environment.h
@@ -87,7 +87,7 @@ class ExecutionEnvironment : public ReferenceTrackedObject<ExecutionEnvironment>
     bool metricsEnabled = false;
     bool fp64EmulationEnabled = false;
 
-    DeviceHierarchyMode deviceHierarchyMode = COMPOSITE;
+    DeviceHierarchyMode deviceHierarchyMode = DeviceHierarchyMode::composite;
     DebuggingMode debuggingEnabledMode = DebuggingMode::disabled;
     std::unordered_map<uint32_t, uint32_t> rootDeviceNumCcsMap;
     std::mutex initializeDirectSubmissionControllerMutex;
diff --git a/shared/source/helpers/device_hierarchy_mode.h b/shared/source/helpers/device_hierarchy_mode.h
index 3c4b349d81..ae44fc4474 100644
--- a/shared/source/helpers/device_hierarchy_mode.h
+++ b/shared/source/helpers/device_hierarchy_mode.h
@@ -8,9 +8,9 @@
 #pragma once
 
 namespace NEO {
-enum DeviceHierarchyMode {
-    COMPOSITE,
-    FLAT,
-    COMBINED
+enum class DeviceHierarchyMode : uint32_t {
+    composite,
+    flat,
+    combined
 };
 };
diff --git a/shared/source/helpers/gfx_core_helper_base.inl b/shared/source/helpers/gfx_core_helper_base.inl
index 9f51d1d39f..311866d635 100644
--- a/shared/source/helpers/gfx_core_helper_base.inl
+++ b/shared/source/helpers/gfx_core_helper_base.inl
@@ -682,7 +682,7 @@ uint32_t GfxCoreHelperHw<GfxFamily>::calculateNumThreadsPerThreadGroup(uint32_t
 
 template <typename GfxFamily>
 DeviceHierarchyMode GfxCoreHelperHw<GfxFamily>::getDefaultDeviceHierarchy() const {
-    return COMPOSITE;
+    return DeviceHierarchyMode::composite;
 }
 
 template <typename GfxFamily>
diff --git a/shared/source/xe_hpc_core/gfx_core_helper_xe_hpc_core.cpp b/shared/source/xe_hpc_core/gfx_core_helper_xe_hpc_core.cpp
index cf52fb6ad7..801c43c922 100644
--- a/shared/source/xe_hpc_core/gfx_core_helper_xe_hpc_core.cpp
+++ b/shared/source/xe_hpc_core/gfx_core_helper_xe_hpc_core.cpp
@@ -300,7 +300,7 @@ bool GfxCoreHelperHw<Family>::isRelaxedOrderingSupported() const {
 
 template <>
 DeviceHierarchyMode GfxCoreHelperHw<Family>::getDefaultDeviceHierarchy() const {
-    return FLAT;
+    return DeviceHierarchyMode::flat;
 }
 
 } // namespace NEO
diff --git a/shared/test/unit_test/execution_environment/execution_environment_tests.cpp b/shared/test/unit_test/execution_environment/execution_environment_tests.cpp
index ec88d9a891..9b7ba90c45 100644
--- a/shared/test/unit_test/execution_environment/execution_environment_tests.cpp
+++ b/shared/test/unit_test/execution_environment/execution_environment_tests.cpp
@@ -558,7 +558,7 @@ TEST(ExecutionEnvironment, givenCorrectZeAffinityMaskWithFlatOrCombinedHierarchy
 
     auto hwInfo = *defaultHwInfo;
 
-    DeviceHierarchyMode deviceHierarchyModes[] = {FLAT, COMBINED};
+    DeviceHierarchyMode deviceHierarchyModes[] = {DeviceHierarchyMode::flat, DeviceHierarchyMode::combined};
     for (auto deviceHierarchyMode : deviceHierarchyModes) {
         MockExecutionEnvironment executionEnvironment(&hwInfo);
         executionEnvironment.incRefInternal();
@@ -579,7 +579,7 @@ TEST(ExecutionEnvironment, givenIncorrectZeAffinityMaskWithFlatOrCombinedHierarc
 
     auto hwInfo = *defaultHwInfo;
 
-    DeviceHierarchyMode deviceHierarchyModes[] = {FLAT, COMBINED};
+    DeviceHierarchyMode deviceHierarchyModes[] = {DeviceHierarchyMode::flat, DeviceHierarchyMode::combined};
     for (auto deviceHierarchyMode : deviceHierarchyModes) {
         MockExecutionEnvironment executionEnvironment(&hwInfo);
         executionEnvironment.incRefInternal();
diff --git a/shared/test/unit_test/helpers/gfx_core_helper_tests.cpp b/shared/test/unit_test/helpers/gfx_core_helper_tests.cpp
index 9890fe32bf..b86c46f71b 100644
--- a/shared/test/unit_test/helpers/gfx_core_helper_tests.cpp
+++ b/shared/test/unit_test/helpers/gfx_core_helper_tests.cpp
@@ -1696,7 +1696,7 @@ HWTEST_F(GfxCoreHelperTest, givenFlagRemoveRestrictionsOnNumberOfThreadsInGpgpuT
 HWTEST2_F(GfxCoreHelperTest, whenGetDefaultDeviceHierarchyThenReturnCompositeHierarchy, IsNotXeHpcCore) {
     const auto &gfxCoreHelper = getHelper<GfxCoreHelper>();
     auto defaultDeviceHierarchy = gfxCoreHelper.getDefaultDeviceHierarchy();
-    EXPECT_EQ(COMPOSITE, defaultDeviceHierarchy);
+    EXPECT_EQ(DeviceHierarchyMode::composite, defaultDeviceHierarchy);
 }
 
 HWTEST_F(GfxCoreHelperTest, givenContextGroupDisabledWhenContextGroupContextsCountAndSecondaryContextsSupportQueriedThenZeroCountAndFalseIsReturned) {
diff --git a/shared/test/unit_test/xe_hpc_core/gfx_core_helper_xe_hpc_core_tests.cpp b/shared/test/unit_test/xe_hpc_core/gfx_core_helper_xe_hpc_core_tests.cpp
index f2aa6b7b55..656d3678ed 100644
--- a/shared/test/unit_test/xe_hpc_core/gfx_core_helper_xe_hpc_core_tests.cpp
+++ b/shared/test/unit_test/xe_hpc_core/gfx_core_helper_xe_hpc_core_tests.cpp
@@ -113,5 +113,5 @@ XE_HPC_CORETEST_F(GfxCoreHelperXeHpcCoreTest, whenGetDefaultDeviceHierarchyThenR
     auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper<GfxCoreHelper>();
 
     auto defaultDeviceHierarchy = gfxCoreHelper.getDefaultDeviceHierarchy();
-    EXPECT_EQ(FLAT, defaultDeviceHierarchy);
+    EXPECT_EQ(DeviceHierarchyMode::flat, defaultDeviceHierarchy);
 }