diff --git a/.clang-tidy b/.clang-tidy
index 26638713e9..259d2513a1 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -12,6 +12,12 @@ CheckOptions:
     value:           '10'
   - key:             google-readability-namespace-comments.SpacesBeforeComments
     value:           '2'
+  - key:             readability-identifier-naming.ClassCase
+    value:           CamelCase
+  - key:             readability-identifier-naming.StructCase
+    value:           CamelCase
+  - key:             readability-identifier-naming.StructIgnoredRegexp
+    value:           '.*'
   - key:             readability-identifier-naming.MethodCase
     value:           camelBack
   - key:             readability-identifier-naming.ParameterCase
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h b/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h
index f7bd7fbf3e..bd24dc4512 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_api_tracing_common.h
@@ -53,7 +53,7 @@ class ZeAPITracingCoreTestsFixture {
     }
 };
 
-class zeAPITracingCoreTests : public ZeAPITracingCoreTestsFixture, public ::testing::Test {
+class ZeApiTracingCoreTests : public ZeAPITracingCoreTestsFixture, public ::testing::Test {
 
   protected:
     void SetUp() override {
@@ -65,7 +65,7 @@ class zeAPITracingCoreTests : public ZeAPITracingCoreTestsFixture, public ::test
     }
 };
 
-class zeAPITracingRuntimeTests : public ZeAPITracingCoreTestsFixture, public ::testing::Test {
+class ZeApiTracingRuntimeTests : public ZeAPITracingCoreTestsFixture, public ::testing::Test {
 
   protected:
     zet_core_callbacks_t prologCbs = {};
@@ -109,7 +109,7 @@ class zeAPITracingRuntimeTests : public ZeAPITracingCoreTestsFixture, public ::t
     }
 };
 
-class zeAPITracingRuntimeMultipleArgumentsTests : public ZeAPITracingCoreTestsFixture, public ::testing::Test {
+class ZeApiTracingRuntimeMultipleArgumentsTests : public ZeAPITracingCoreTestsFixture, public ::testing::Test {
 
   protected:
     zet_core_callbacks_t prologCbs0 = {};
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_barrier_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_barrier_api_tracing.cpp
index 9e68ff2df8..480b6202f9 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_barrier_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_barrier_api_tracing.cpp
@@ -10,7 +10,7 @@
 namespace L0 {
 namespace ult {
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendBarrierTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendBarrierTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendBarrier =
         [](ze_command_list_handle_t hCommandList, ze_event_handle_t hSignalEvent,
@@ -28,7 +28,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendBarrierTracingWrapp
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendMemoryRangesBarrierTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryRangesBarrierTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryRangesBarrier =
         [](ze_command_list_handle_t hCommandList, uint32_t numRanges, const size_t *pRangeSizes, const void **pRanges,
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_cmdlist_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_cmdlist_api_tracing.cpp
index 690e375b9a..1deae4fe1f 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_cmdlist_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_cmdlist_api_tracing.cpp
@@ -10,7 +10,7 @@
 namespace L0 {
 namespace ult {
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnCreate =
         [](ze_context_handle_t hContext,
@@ -30,7 +30,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListCreateTracingWrapperWithO
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListCreateImmediateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListCreateImmediateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnCreateImmediate =
         [](ze_context_handle_t hContext,
@@ -50,7 +50,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListCreateImmediateTracingWra
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnDestroy =
         [](ze_command_list_handle_t hCommandList) { return ZE_RESULT_SUCCESS; };
@@ -64,7 +64,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListDestroyTracingWrapperWith
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListResetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListResetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnReset =
         [](ze_command_list_handle_t hCommandList) { return ZE_RESULT_SUCCESS; };
@@ -78,7 +78,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListResetTracingWrapperWithOn
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendMemoryPrefetchTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryPrefetchTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryPrefetch =
         [](ze_command_list_handle_t hCommandList, const void *ptr, size_t size) { return ZE_RESULT_SUCCESS; };
@@ -92,7 +92,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendMemoryPrefetchTraci
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListCloseTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListCloseTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnClose =
         [](ze_command_list_handle_t hCommandList) { return ZE_RESULT_SUCCESS; };
@@ -106,7 +106,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListCloseTracingWrapperWithOn
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendQueryKernelTimestampsTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendQueryKernelTimestampsTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendQueryKernelTimestamps =
@@ -129,7 +129,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendQueryKernelTimestam
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendWriteGlobalTimestampTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendWriteGlobalTimestampTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendWriteGlobalTimestamp =
         [](ze_command_list_handle_t hCommandList,
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_cmdqueue_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_cmdqueue_api_tracing.cpp
index b89b4742d1..62a5095a4c 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_cmdqueue_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_cmdqueue_api_tracing.cpp
@@ -10,7 +10,7 @@
 namespace L0 {
 namespace ult {
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandQueueCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandQueueCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandQueue.pfnCreate =
         [](ze_context_handle_t hContext,
@@ -30,7 +30,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandQueueCreateTracingWrapperWith
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandQueueDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandQueueDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandQueue.pfnDestroy =
         [](ze_command_queue_handle_t hCommandQueue) { return ZE_RESULT_SUCCESS; };
@@ -44,7 +44,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandQueueDestroyTracingWrapperWit
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandQueueExecuteCommandListsTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandQueueExecuteCommandListsTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     uint32_t numCommandList = 0;
@@ -65,7 +65,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandQueueExecuteCommandListsTraci
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandQueueSynchronizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandQueueSynchronizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandQueue.pfnSynchronize =
         [](ze_command_queue_handle_t hCommandQueue, uint64_t timeout) { return ZE_RESULT_SUCCESS; };
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_copy_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_copy_api_tracing.cpp
index 61a3c80bd4..f9d49467b7 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_copy_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_copy_api_tracing.cpp
@@ -10,7 +10,7 @@
 namespace L0 {
 namespace ult {
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendMemoryCopyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryCopyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryCopy =
@@ -39,7 +39,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendMemoryCopyTracingWr
     free(src);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendMemoryFillTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryFillTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryFill =
         [](ze_command_list_handle_t hCommandList,
@@ -67,7 +67,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendMemoryFillTracingWr
     free(dst);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendMemoryCopyRegionTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryCopyRegionTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryCopyRegion =
         [](ze_command_list_handle_t hCommandList,
@@ -114,7 +114,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendMemoryCopyRegionTra
     free(src);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendImageCopyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendImageCopyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopy =
         [](ze_command_list_handle_t hCommandList,
@@ -140,7 +140,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendImageCopyTracingWra
     free(hSrcImage);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendImageCopyRegionTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendImageCopyRegionTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopyRegion =
         [](ze_command_list_handle_t hCommandList,
@@ -168,7 +168,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendImageCopyRegionTrac
     free(hSrcImage);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendImageCopyToMemoryTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendImageCopyToMemoryTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopyToMemory =
         [](ze_command_list_handle_t hCommandList,
@@ -195,7 +195,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendImageCopyToMemoryTr
     free(dstptr);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendImageCopyFromMemoryTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendImageCopyFromMemoryTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendImageCopyFromMemory =
         [](ze_command_list_handle_t hCommandList,
@@ -222,7 +222,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendImageCopyFromMemory
     free(srcptr);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendMemAdviseTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemAdviseTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemAdvise =
         [](ze_command_list_handle_t hCommandList,
@@ -247,7 +247,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendMemAdviseTracingWra
     free(ptr);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendMemoryCopyFromContextTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendMemoryCopyFromContextTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendMemoryCopyFromContext =
         [](ze_command_list_handle_t hCommandList,
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_core_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_core_api_tracing.cpp
index 65ee1de33d..e063de8cca 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_core_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_core_api_tracing.cpp
@@ -144,7 +144,7 @@ void onExitCommandListCloseWithoutUserDataAndReadInstanceData(
     delete instanceData;
 }
 
-TEST(zeAPITracingCoreTestsNoSetup, WhenCreateTracerAndNoZetInitThenReturnFailure) {
+TEST(ZeApiTracingCoreTestsNoSetup, WhenCreateTracerAndNoZetInitThenReturnFailure) {
     ze_result_t result;
 
     zet_tracer_exp_handle_t apiTracerHandle;
@@ -154,7 +154,7 @@ TEST(zeAPITracingCoreTestsNoSetup, WhenCreateTracerAndNoZetInitThenReturnFailure
     EXPECT_EQ(ZE_RESULT_ERROR_UNINITIALIZED, result);
 }
 
-TEST_F(zeAPITracingCoreTests, WhenCreateTracerAndsetCallbacksAndEnableTracingAndDisableTracingAndDestroyTracerThenReturnSuccess) {
+TEST_F(ZeApiTracingCoreTests, WhenCreateTracerAndsetCallbacksAndEnableTracingAndDisableTracingAndDestroyTracerThenReturnSuccess) {
     ze_result_t result;
 
     zet_tracer_exp_handle_t apiTracerHandle;
@@ -187,7 +187,7 @@ TEST_F(zeAPITracingCoreTests, WhenCreateTracerAndsetCallbacksAndEnableTracingAnd
     EXPECT_EQ(ZE_RESULT_SUCCESS, result);
 }
 
-TEST_F(zeAPITracingCoreTests, WhenCallingTracerWrapperWithOnePrologAndNoEpilogWithUserDataAndUserDataMatchingInPrologThenReturnSuccess) {
+TEST_F(ZeApiTracingCoreTests, WhenCallingTracerWrapperWithOnePrologAndNoEpilogWithUserDataAndUserDataMatchingInPrologThenReturnSuccess) {
     MockCommandList commandList;
     ze_result_t result;
     int userData = 5;
@@ -211,7 +211,7 @@ TEST_F(zeAPITracingCoreTests, WhenCallingTracerWrapperWithOnePrologAndNoEpilogWi
     EXPECT_EQ(ZE_RESULT_SUCCESS, result);
 }
 
-TEST_F(zeAPITracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsWithUserDataAndUserDataMatchingInPrologAndEpilogThenReturnSuccess) {
+TEST_F(ZeApiTracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsWithUserDataAndUserDataMatchingInPrologAndEpilogThenReturnSuccess) {
     MockCommandList commandList;
     ze_result_t result;
     int userData = 5;
@@ -241,7 +241,7 @@ TEST_F(zeAPITracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsW
     EXPECT_EQ(ZE_RESULT_SUCCESS, result);
 }
 
-TEST_F(zeAPITracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsWithUserDataAndInstanceDataUserDataMatchingInPrologAndEpilogThenReturnSuccess) {
+TEST_F(ZeApiTracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsWithUserDataAndInstanceDataUserDataMatchingInPrologAndEpilogThenReturnSuccess) {
     MockCommandList commandList;
     ze_result_t result;
     int userData = 5;
@@ -271,7 +271,7 @@ TEST_F(zeAPITracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsW
     EXPECT_EQ(ZE_RESULT_SUCCESS, result);
 }
 
-TEST_F(zeAPITracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsWithInstanceDataThenReturnSuccess) {
+TEST_F(ZeApiTracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsWithInstanceDataThenReturnSuccess) {
     MockCommandList commandList;
     ze_result_t result;
     ze_command_list_close_params_t tracerParams;
@@ -300,7 +300,7 @@ TEST_F(zeAPITracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsW
     EXPECT_EQ(ZE_RESULT_SUCCESS, result);
 }
 
-TEST_F(zeAPITracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsWithRecursionHandledThenSuccessIsReturned) {
+TEST_F(ZeApiTracingCoreTests, WhenCallingTracerWrapperWithOneSetOfPrologEpilogsWithRecursionHandledThenSuccessIsReturned) {
     MockCommandList commandList;
     ze_result_t result;
     int userData = 5;
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_device_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_device_api_tracing.cpp
index 6cea4ca9de..3450b8decb 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_device_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_device_api_tracing.cpp
@@ -10,7 +10,7 @@
 namespace L0 {
 namespace ult {
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Device.pfnGet =
         [](ze_driver_handle_t hDriver, uint32_t *pCount, ze_device_handle_t *phDevices) { return ZE_RESULT_SUCCESS; };
@@ -25,7 +25,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetTracingWrapperWithOneSetOfP
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Device.pfnGetProperties =
         [](ze_device_handle_t hDevice, ze_device_properties_t *pDeviceProperties) { return ZE_RESULT_SUCCESS; };
@@ -40,7 +40,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetPropertiesTracingWrapperWit
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetComputePropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetComputePropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Device.pfnGetComputeProperties =
         [](ze_device_handle_t hDevice, ze_device_compute_properties_t *pComputeProperties) { return ZE_RESULT_SUCCESS; };
@@ -55,7 +55,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetComputePropertiesTracingWra
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetMemoryPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetMemoryPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Device.pfnGetMemoryProperties =
         [](ze_device_handle_t hDevice, uint32_t *pCount, ze_device_memory_properties_t *pMemProperties) { return ZE_RESULT_SUCCESS; };
@@ -70,7 +70,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetMemoryPropertiesTracingWrap
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetCachePropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetCachePropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Device.pfnGetCacheProperties =
         [](ze_device_handle_t hDevice,
@@ -87,7 +87,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetCachePropertiesTracingWrapp
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetImagePropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetImagePropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Device.pfnGetImageProperties =
         [](ze_device_handle_t hDevice,
@@ -103,7 +103,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetImagePropertiesTracingWrapp
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetSubDevicesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetSubDevicesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Device.pfnGetSubDevices =
         [](ze_device_handle_t hDevice,
@@ -122,7 +122,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetSubDevicesTracingWrapperWit
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetP2PPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetP2PPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Device.pfnGetP2PProperties =
         [](ze_device_handle_t hDevice,
@@ -141,7 +141,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetP2PPropertiesTracingWrapper
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceCanAccessPeerTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceCanAccessPeerTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Device.pfnCanAccessPeer =
         [](ze_device_handle_t hDevice,
@@ -160,7 +160,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceCanAccessPeerTracingWrapperWit
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelSetCacheConfigTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSetCacheConfigTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Kernel.pfnSetCacheConfig =
         [](ze_kernel_handle_t hKernel,
@@ -178,7 +178,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelSetCacheConfigTracingWrapperWi
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetModulePropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetModulePropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Device.pfnGetModuleProperties =
         [](ze_device_handle_t hDevice,
@@ -194,7 +194,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetModulePropertiesTracingWrap
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetMemoryAccessPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetMemoryAccessPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Device.pfnGetMemoryAccessProperties =
         [](ze_device_handle_t hDevice,
@@ -210,7 +210,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetMemoryAccessPropertiesTraci
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetCommandQueueGroupPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetCommandQueueGroupPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Device.pfnGetCommandQueueGroupProperties =
         [](ze_device_handle_t hDevice, uint32_t *pCount, ze_command_queue_group_properties_t *pCommandQueueGroupProperties) { return ZE_RESULT_SUCCESS; };
@@ -225,7 +225,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetCommandQueueGroupProperties
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetExternalMemoryPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetExternalMemoryPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Device.pfnGetExternalMemoryProperties =
         [](ze_device_handle_t hDevice, ze_device_external_memory_properties_t *pExternalMemoryProperties) { return ZE_RESULT_SUCCESS; };
@@ -240,7 +240,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetExternalMemoryPropertiesTra
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingDeviceGetStatusTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingDeviceGetStatusTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Device.pfnGetStatus =
         [](ze_device_handle_t hDevice) { return ZE_RESULT_SUCCESS; };
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_driver_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_driver_api_tracing.cpp
index 3e493256ee..30f9137dff 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_driver_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_driver_api_tracing.cpp
@@ -10,7 +10,7 @@
 namespace L0 {
 namespace ult {
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingzeDriverGetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingzeDriverGetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Driver.pfnGet =
         [](uint32_t *pCount, ze_driver_handle_t *phDrivers) { return ZE_RESULT_SUCCESS; };
@@ -25,7 +25,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingzeDriverGetTracingWrapperWithOneSetO
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingzeDriverGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingzeDriverGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Driver.pfnGetProperties =
         [](ze_driver_handle_t hDriver, ze_driver_properties_t *properties) { return ZE_RESULT_SUCCESS; };
@@ -39,7 +39,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingzeDriverGetPropertiesTracingWrapperW
     EXPECT_EQ(ZE_RESULT_SUCCESS, result);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingzeDriverGetApiVersionTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingzeDriverGetApiVersionTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Driver.pfnGetApiVersion =
         [](ze_driver_handle_t hDrivers, ze_api_version_t *version) { return ZE_RESULT_SUCCESS; };
@@ -54,7 +54,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingzeDriverGetApiVersionTracingWrapperW
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingzeDriverGetIpcPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingzeDriverGetIpcPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Driver.pfnGetIpcProperties =
         [](ze_driver_handle_t hDrivers,
@@ -70,7 +70,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingzeDriverGetIpcPropertiesTracingWrapp
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingzeDriverGetExtensionPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingzeDriverGetExtensionPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Driver.pfnGetExtensionProperties =
         [](ze_driver_handle_t hDrivers,
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_event_api_multi_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_event_api_multi_tracing.cpp
index bb904002e3..a17853aa8c 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_event_api_multi_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_event_api_multi_tracing.cpp
@@ -24,7 +24,7 @@ struct {
     void *instanceData3;
 } event_create_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingEventCreateTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventCreateTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -258,7 +258,7 @@ struct {
     void *instanceData3;
 } event_destroy_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingEventDestroyTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventDestroyTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -387,7 +387,7 @@ struct {
     void *instanceData3;
 } event_host_signal_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingEventHostSignalTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventHostSignalTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -518,7 +518,7 @@ struct {
     void *instanceData3;
 } event_host_synchronize_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingEventHostSynchronizeTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventHostSynchronizeTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -657,7 +657,7 @@ struct {
     void *instanceData3;
 } event_query_status_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingEventQueryStatusTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventQueryStatusTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -786,7 +786,7 @@ struct {
     void *instanceData3;
 } event_reset_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingEventHostResetTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventHostResetTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -929,7 +929,7 @@ struct {
     void *instanceData3;
 } event_pool_create_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolCreateTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolCreateTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -1216,7 +1216,7 @@ struct {
     void *instanceData3;
 } event_pool_destroy_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolDestroyTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolDestroyTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -1365,7 +1365,7 @@ static bool eventPoolGetIpcHandlesCompare(ze_ipc_event_pool_handle_t *phIpc0, ze
     return (memcmp((void *)phIpc0, (void *)phIpc1, sizeof(ze_ipc_event_pool_handle_t)) == 0);
 }
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolGetIpcHandleTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolGetIpcHandleTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -1529,7 +1529,7 @@ static bool eventPoolOpenIpcHandlesCompare(ze_ipc_event_pool_handle_t *phIpc0, z
     return (memcmp((void *)phIpc0, (void *)phIpc1, sizeof(ze_ipc_event_pool_handle_t)) == 0);
 }
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolOpenIpcHandleTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolOpenIpcHandleTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -1768,7 +1768,7 @@ struct {
     void *instanceData3;
 } event_pool_close_ipc_handle_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolCloseIpcHandleTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingEventPoolCloseIpcHandleTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -1901,7 +1901,7 @@ struct {
     void *instanceData3;
 } command_list_append_signal_event_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingCommandListAppendSignalEventTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingCommandListAppendSignalEventTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -2042,7 +2042,7 @@ struct {
     void *instanceData3;
 } command_list_append_wait_on_events_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingCommandListAppendWaitOnEventsTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingCommandListAppendWaitOnEventsTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_event_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_event_api_tracing.cpp
index 4a5d9b2c9b..71afb94614 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_event_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_event_api_tracing.cpp
@@ -10,7 +10,7 @@
 namespace L0 {
 namespace ult {
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingEventCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Event.pfnCreate =
         [](ze_event_pool_handle_t hEventPool, const ze_event_desc_t *desc, ze_event_handle_t *phEvent) { return ZE_RESULT_SUCCESS; };
@@ -27,7 +27,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingEventCreateTracingWrapperWithOneSetO
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingEventDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Event.pfnDestroy =
         [](ze_event_handle_t hEvent) { return ZE_RESULT_SUCCESS; };
@@ -42,7 +42,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingEventDestroyTracingWrapperWithOneSet
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingEventHostSignalTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventHostSignalTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Event.pfnHostSignal =
         [](ze_event_handle_t hEvent) { return ZE_RESULT_SUCCESS; };
@@ -56,7 +56,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingEventHostSignalTracingWrapperWithOne
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingEventHostSynchronizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventHostSynchronizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Event.pfnHostSynchronize =
         [](ze_event_handle_t hEvent, uint64_t timeout) { return ZE_RESULT_SUCCESS; };
@@ -70,7 +70,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingEventHostSynchronizeTracingWrapperWi
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingEventQueryStatusTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventQueryStatusTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Event.pfnQueryStatus =
         [](ze_event_handle_t hEvent) { return ZE_RESULT_SUCCESS; };
@@ -84,7 +84,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingEventQueryStatusTracingWrapperWithOn
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingEventHostResetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventHostResetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Event.pfnHostReset =
         [](ze_event_handle_t hEvent) { return ZE_RESULT_SUCCESS; };
@@ -98,7 +98,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingEventHostResetTracingWrapperWithOneS
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingEventPoolCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.EventPool.pfnCreate =
         [](ze_context_handle_t hContext,
@@ -116,7 +116,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingEventPoolCreateTracingWrapperWithOne
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingEventPoolDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.EventPool.pfnDestroy =
         [](ze_event_pool_handle_t hEventPool) { return ZE_RESULT_SUCCESS; };
@@ -130,7 +130,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingEventPoolDestroyTracingWrapperWithOn
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingEventPoolGetIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolGetIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.EventPool.pfnGetIpcHandle =
         [](ze_event_pool_handle_t hEventPool, ze_ipc_event_pool_handle_t *phIpc) { return ZE_RESULT_SUCCESS; };
@@ -146,7 +146,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingEventPoolGetIpcHandleTracingWrapperW
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingEventPoolOpenIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolOpenIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.EventPool.pfnOpenIpcHandle =
         [](ze_context_handle_t hDriver,
@@ -165,7 +165,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingEventPoolOpenIpcHandleTracingWrapper
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingEventPoolCloseIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventPoolCloseIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.EventPool.pfnCloseIpcHandle =
         [](ze_event_pool_handle_t hEventPool) { return ZE_RESULT_SUCCESS; };
@@ -181,7 +181,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingEventPoolCloseIpcHandleTracingWrappe
 
 // Command List API with Events
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendSignalEventTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendSignalEventTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendSignalEvent =
         [](ze_command_list_handle_t hCommandList, ze_event_handle_t hEvent) { return ZE_RESULT_SUCCESS; };
@@ -195,7 +195,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendSignalEventTracingW
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendWaitOnEventsTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendWaitOnEventsTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendWaitOnEvents =
         [](ze_command_list_handle_t hCommandList, uint32_t numEvents, ze_event_handle_t *phEvents) { return ZE_RESULT_SUCCESS; };
@@ -212,7 +212,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendWaitOnEventsTracing
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendEventResetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendEventResetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendEventReset =
         [](ze_command_list_handle_t hCommandList, ze_event_handle_t hEvent) { return ZE_RESULT_SUCCESS; };
@@ -227,7 +227,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendEventResetTracingWr
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingEventQueryKernelTimestampTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingEventQueryKernelTimestampTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Event.pfnQueryKernelTimestamp =
         [](ze_event_handle_t hEvent, ze_kernel_timestamp_result_t *dstptr) { return ZE_RESULT_SUCCESS; };
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_fence_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_fence_api_tracing.cpp
index cf4edbf550..1afe5adc72 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_fence_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_fence_api_tracing.cpp
@@ -10,7 +10,7 @@
 namespace L0 {
 namespace ult {
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingFenceCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingFenceCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Fence.pfnCreate =
         [](ze_command_queue_handle_t hCommandQueue, const ze_fence_desc_t *desc, ze_fence_handle_t *phFence) { return ZE_RESULT_SUCCESS; };
@@ -27,7 +27,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingFenceCreateTracingWrapperWithOneSetO
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingFenceDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingFenceDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Fence.pfnDestroy =
         [](ze_fence_handle_t hFence) { return ZE_RESULT_SUCCESS; };
@@ -42,7 +42,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingFenceDestroyTracingWrapperWithOneSet
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingFenceHostSynchronizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingFenceHostSynchronizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Fence.pfnHostSynchronize =
         [](ze_fence_handle_t hFence, uint64_t timeout) { return ZE_RESULT_SUCCESS; };
@@ -56,7 +56,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingFenceHostSynchronizeTracingWrapperWi
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingFenceQueryStatusTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingFenceQueryStatusTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Fence.pfnQueryStatus =
         [](ze_fence_handle_t hFence) { return ZE_RESULT_SUCCESS; };
@@ -70,7 +70,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingFenceQueryStatusTracingWrapperWithOn
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingFenceResetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingFenceResetTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Fence.pfnReset =
         [](ze_fence_handle_t hFence) { return ZE_RESULT_SUCCESS; };
@@ -96,7 +96,7 @@ struct {
     void *instanceData3;
 } fence_create_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingFenceCreateTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingFenceCreateTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -332,7 +332,7 @@ struct {
     void *instanceData3;
 } fence_destroy_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingFenceDestroyTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingFenceDestroyTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -463,7 +463,7 @@ struct {
     void *instanceData3;
 } fence_host_synchronize_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingFenceHostSynchronizeTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingFenceHostSynchronizeTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -602,7 +602,7 @@ struct {
     void *instanceData3;
 } fence_query_status_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingFenceQueryStatusTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingFenceQueryStatusTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -731,7 +731,7 @@ struct {
     void *instanceData3;
 } fence_reset_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingFenceResetTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingFenceResetTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_global_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_global_api_tracing.cpp
index 7141a890fc..448ece1af9 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_global_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_global_api_tracing.cpp
@@ -10,7 +10,7 @@
 namespace L0 {
 namespace ult {
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingInitTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingInitTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Global.pfnInit = [](ze_init_flags_t flags) { return ZE_RESULT_SUCCESS; };
 
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_image_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_image_api_tracing.cpp
index f7bdc6bf71..04aa6afcee 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_image_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_image_api_tracing.cpp
@@ -10,7 +10,7 @@
 namespace L0 {
 namespace ult {
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingImageGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingImageGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Image.pfnGetProperties =
         [](ze_device_handle_t hDevice, const ze_image_desc_t *desc, ze_image_properties_t *pImageProperties) { return ZE_RESULT_SUCCESS; };
@@ -27,7 +27,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingImageGetPropertiesTracingWrapperWith
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingImageCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingImageCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Image.pfnCreate =
         [](ze_context_handle_t hContext, ze_device_handle_t hDevice, const ze_image_desc_t *desc, ze_image_handle_t *phImage) { return ZE_RESULT_SUCCESS; };
@@ -44,7 +44,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingImageCreateTracingWrapperWithOneSetO
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingImageDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingImageDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Image.pfnDestroy =
         [](ze_image_handle_t hImage) { return ZE_RESULT_SUCCESS; };
@@ -71,7 +71,7 @@ struct {
     void *instanceData3;
 } ImageGetProperties_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingImageGetPropertiesTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingImageGetPropertiesTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -223,7 +223,7 @@ struct {
     void *instanceData3;
 } ImageCreate_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingImageCreateTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingImageCreateTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -477,7 +477,7 @@ struct {
     void *instanceData3;
 } ImageDestroy_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingImageDestroyTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingImageDestroyTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_memory_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_memory_api_tracing.cpp
index 53cc1937a7..1c60b56268 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_memory_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_memory_api_tracing.cpp
@@ -10,7 +10,7 @@
 namespace L0 {
 namespace ult {
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingMemAllocSharedTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemAllocSharedTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Mem.pfnAllocShared =
         [](ze_context_handle_t hContext, const ze_device_mem_alloc_desc_t *deviceDesc, const ze_host_mem_alloc_desc_t *hostDesc, size_t size, size_t alignment, ze_device_handle_t hDevice, void **pptr) { return ZE_RESULT_SUCCESS; };
@@ -31,7 +31,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingMemAllocSharedTracingWrapperWithOneS
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingMemAllocDeviceTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemAllocDeviceTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Mem.pfnAllocDevice =
         [](ze_context_handle_t hContext, const ze_device_mem_alloc_desc_t *deviceDesc, size_t size, size_t alignment, ze_device_handle_t hDevice, void **pptr) { return ZE_RESULT_SUCCESS; };
@@ -51,7 +51,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingMemAllocDeviceTracingWrapperWithOneS
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingMemAllocHostTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemAllocHostTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.Mem.pfnAllocHost =
         [](ze_context_handle_t hContext, const ze_host_mem_alloc_desc_t *hostDesc, size_t size, size_t alignment, void **pptr) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -70,7 +70,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingMemAllocHostTracingWrapperWithOneSet
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingMemFreeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemFreeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.Mem.pfnFree =
         [](ze_context_handle_t hContext, void *ptr) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -85,7 +85,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingMemFreeTracingWrapperWithOneSetOfPro
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingMemGetAllocPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemGetAllocPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.Mem.pfnGetAllocProperties =
         [](ze_context_handle_t hContext, const void *ptr, ze_memory_allocation_properties_t *pMemAllocProperties, ze_device_handle_t *phDevice) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -100,7 +100,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingMemGetAllocPropertiesTracingWrapperW
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingMemGetAddressRangeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemGetAddressRangeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.Mem.pfnGetAddressRange =
         [](ze_context_handle_t hContext, const void *ptr, void **pBase, size_t *pSize) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -115,7 +115,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingMemGetAddressRangeTracingWrapperWith
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingMemGetIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemGetIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.Mem.pfnGetIpcHandle =
         [](ze_context_handle_t hContext, const void *ptr, ze_ipc_mem_handle_t *pIpcHandle) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -130,7 +130,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingMemGetIpcHandleTracingWrapperWithOne
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingMemOpenIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemOpenIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.Mem.pfnOpenIpcHandle =
         [](ze_context_handle_t hContext, ze_device_handle_t hDevice, ze_ipc_mem_handle_t handle, ze_ipc_memory_flags_t flags, void **pptr) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -147,7 +147,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingMemOpenIpcHandleTracingWrapperWithOn
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingMemCloseIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingMemCloseIpcHandleTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.Mem.pfnCloseIpcHandle =
         [](ze_context_handle_t hContext, const void *ptr) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -162,7 +162,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingMemCloseIpcHandleTracingWrapperWithO
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingPhysicalMemCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingPhysicalMemCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.PhysicalMem.pfnCreate =
         [](ze_context_handle_t hContext, ze_device_handle_t hDevice, ze_physical_mem_desc_t *desc, ze_physical_mem_handle_t *phPhysicalMemory) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -178,7 +178,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingPhysicalMemCreateTracingWrapperWithO
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingPhysicalMemDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingPhysicalMemDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.PhysicalMem.pfnDestroy =
         [](ze_context_handle_t hContext, ze_physical_mem_handle_t hPhysicalMemory) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -194,7 +194,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingPhysicalMemDestroyTracingWrapperWith
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingVirtualMemFreeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemFreeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.VirtualMem.pfnFree =
         [](ze_context_handle_t hContext, const void *ptr, size_t size) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -210,7 +210,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingVirtualMemFreeTracingWrapperWithOneS
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingVirtualMemGetAccessAttributeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemGetAccessAttributeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.VirtualMem.pfnGetAccessAttribute =
         [](ze_context_handle_t hContext, const void *ptr, size_t size, ze_memory_access_attribute_t *access, size_t *outSize) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -226,7 +226,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingVirtualMemGetAccessAttributeTracingW
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingVirtualMemMapTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemMapTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.VirtualMem.pfnMap =
         [](ze_context_handle_t hContext, const void *ptr, size_t size, ze_physical_mem_handle_t hPhysicalMemory, size_t offset, ze_memory_access_attribute_t access) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -242,7 +242,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingVirtualMemMapTracingWrapperWithOneSe
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingVirtualMemQueryPageSizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemQueryPageSizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.VirtualMem.pfnQueryPageSize =
         [](ze_context_handle_t hContext, ze_device_handle_t hDevice, size_t size, size_t *pagesize) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -258,7 +258,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingVirtualMemQueryPageSizeTracingWrappe
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingVirtualMemReserveTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemReserveTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.VirtualMem.pfnReserve =
         [](ze_context_handle_t hContext, const void *pStart, size_t size, void **pptr) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -274,7 +274,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingVirtualMemReserveTracingWrapperWithO
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingVirtualMemSetAccessAttributeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemSetAccessAttributeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.VirtualMem.pfnSetAccessAttribute =
         [](ze_context_handle_t hContext, const void *ptr, size_t size, ze_memory_access_attribute_t access) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
@@ -290,7 +290,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingVirtualMemSetAccessAttributeTracingW
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingVirtualMemUnmapTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingVirtualMemUnmapTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     driver_ddiTable.core_ddiTable.VirtualMem.pfnUnmap =
         [](ze_context_handle_t hContext, const void *ptr, size_t size) { return ZE_RESULT_SUCCESS; };
     ze_result_t result;
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_module_api_multi_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_module_api_multi_tracing.cpp
index aeba47662d..7d80b7a3fc 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_module_api_multi_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_module_api_multi_tracing.cpp
@@ -46,7 +46,7 @@ static bool moduleCreateDescCompare(const ze_module_desc_t *phIpc0, const ze_mod
     return (memcmp((void *)phIpc0, (void *)phIpc1, sizeof(ze_module_desc_t)) == 0);
 }
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingModuleCreateTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingModuleCreateTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -385,7 +385,7 @@ struct {
     void *instanceData3;
 } module_destroy_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingModuleDestroyTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingModuleDestroyTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -538,7 +538,7 @@ static bool moduleGetNativeBinaryNativeBinaryCompare(uint8_t *binary0, uint8_t *
     return (memcmp(static_cast<void *>(binary0), static_cast<void *>(binary1), size) == 0);
 }
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingModuleGetNativeBinaryTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingModuleGetNativeBinaryTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_module_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_module_api_tracing.cpp
index 811db3c81a..c27c08b683 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_module_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_module_api_tracing.cpp
@@ -10,7 +10,7 @@
 namespace L0 {
 namespace ult {
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Module.pfnCreate =
         [](ze_context_handle_t hContext, ze_device_handle_t hDevice, const ze_module_desc_t *pDesc, ze_module_handle_t *phModule, ze_module_build_log_handle_t *phBuildLog) { return ZE_RESULT_SUCCESS; };
@@ -28,7 +28,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleCreateTracingWrapperWithOneSet
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Module.pfnDestroy =
         [](ze_module_handle_t hModule) { return ZE_RESULT_SUCCESS; };
@@ -43,7 +43,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleDestroyTracingWrapperWithOneSe
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleBuildLogDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleBuildLogDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.ModuleBuildLog.pfnDestroy =
         [](ze_module_build_log_handle_t hModuleBuildLog) { return ZE_RESULT_SUCCESS; };
@@ -58,7 +58,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleBuildLogDestroyTracingWrapperW
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleBuildLogGetStringTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleBuildLogGetStringTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.ModuleBuildLog.pfnGetString =
         [](ze_module_build_log_handle_t hModuleBuildLog, size_t *pSize, char *pBuildLog) { return ZE_RESULT_SUCCESS; };
@@ -76,7 +76,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleBuildLogGetStringTracingWrappe
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleGetNativeBinaryTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleGetNativeBinaryTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Module.pfnGetNativeBinary =
         [](ze_module_handle_t hModule, size_t *pSize, uint8_t *pModuleNativeBinary) { return ZE_RESULT_SUCCESS; };
@@ -93,7 +93,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleGetNativeBinaryTracingWrapperW
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleGetGlobalPointerTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleGetGlobalPointerTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Module.pfnGetGlobalPointer =
         [](ze_module_handle_t hModule, const char *pGlobalName, size_t *pSize, void **pPtr) { return ZE_RESULT_SUCCESS; };
@@ -111,7 +111,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleGetGlobalPointerTracingWrapper
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Kernel.pfnCreate =
         [](ze_module_handle_t hModule, const ze_kernel_desc_t *pDesc, ze_kernel_handle_t *phKernel) { return ZE_RESULT_SUCCESS; };
@@ -128,7 +128,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelCreateTracingWrapperWithOneSet
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Kernel.pfnDestroy =
         [](ze_kernel_handle_t hKernel) { return ZE_RESULT_SUCCESS; };
@@ -143,7 +143,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelDestroyTracingWrapperWithOneSe
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleGetFunctionPointerTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleGetFunctionPointerTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Module.pfnGetFunctionPointer =
         [](ze_module_handle_t hModule, const char *pKernelName, void **pfnFunction) { return ZE_RESULT_SUCCESS; };
@@ -160,7 +160,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleGetFunctionPointerTracingWrapp
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelSetGroupSizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSetGroupSizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Kernel.pfnSetGroupSize =
         [](ze_kernel_handle_t hKernel, uint32_t groupSizeX, uint32_t groupSizeY, uint32_t groupSizeZ) { return ZE_RESULT_SUCCESS; };
@@ -178,7 +178,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelSetGroupSizeTracingWrapperWith
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelSuggestGroupSizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSuggestGroupSizeTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Kernel.pfnSuggestGroupSize =
         [](ze_kernel_handle_t hKernel, uint32_t globalSizeX, uint32_t globalSizeY, uint32_t globalSizeZ, uint32_t *groupSizeX, uint32_t *groupSizeY, uint32_t *groupSizeZ) { return ZE_RESULT_SUCCESS; };
@@ -199,7 +199,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelSuggestGroupSizeTracingWrapper
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelSetArgumentValueTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSetArgumentValueTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Kernel.pfnSetArgumentValue =
         [](ze_kernel_handle_t hKernel, uint32_t argIndex, size_t argSize, const void *pArgValue) { return ZE_RESULT_SUCCESS; };
@@ -217,7 +217,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelSetArgumentValueTracingWrapper
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Kernel.pfnGetProperties =
         [](ze_kernel_handle_t hKernel, ze_kernel_properties_t *pKernelProperties) { return ZE_RESULT_SUCCESS; };
@@ -232,7 +232,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelGetPropertiesTracingWrapperWit
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendLaunchKernelTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendLaunchKernelTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchKernel =
         [](ze_command_list_handle_t hCommandList, ze_kernel_handle_t hKernel, const ze_group_count_t *pLaunchFuncArgs,
@@ -252,7 +252,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendLaunchKernelTracing
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendLaunchKernelIndirectTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendLaunchKernelIndirectTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchKernelIndirect =
         [](ze_command_list_handle_t hCommandList, ze_kernel_handle_t hKernel, const ze_group_count_t *pLaunchArgumentsBuffer,
@@ -272,7 +272,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendLaunchKernelIndirec
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendLaunchMultipleKernelsIndirectTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendLaunchMultipleKernelsIndirectTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchMultipleKernelsIndirect =
         [](ze_command_list_handle_t hCommandList, uint32_t numKernels, ze_kernel_handle_t *phKernels,
@@ -296,7 +296,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendLaunchMultipleKerne
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendLaunchCooperativeKernelTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingCommandListAppendLaunchCooperativeKernelTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.CommandList.pfnAppendLaunchCooperativeKernel =
         [](ze_command_list_handle_t hCommandList, ze_kernel_handle_t hKernel, const ze_group_count_t *pLaunchFuncArgs, ze_event_handle_t hSignalEvent, uint32_t numWaitEvents, ze_event_handle_t *phWaitEvents) { return ZE_RESULT_SUCCESS; };
@@ -311,7 +311,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingCommandListAppendLaunchCooperativeKe
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleGetKernelNamesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleGetKernelNamesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Module.pfnGetKernelNames =
         [](ze_module_handle_t hDevice, uint32_t *pCount, const char **pNames) { return ZE_RESULT_SUCCESS; };
@@ -326,7 +326,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleGetKernelNamesTracingWrapperWi
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelSuggestMaxCooperativeGroupCountTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSuggestMaxCooperativeGroupCountTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Kernel.pfnSuggestMaxCooperativeGroupCount =
         [](ze_kernel_handle_t hKernel, uint32_t *totalGroupCount) { return ZE_RESULT_SUCCESS; };
@@ -341,7 +341,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelSuggestMaxCooperativeGroupCoun
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelGetIndirectAccessTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelGetIndirectAccessTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Kernel.pfnGetIndirectAccess =
         [](ze_kernel_handle_t hKernel, ze_kernel_indirect_access_flags_t *pFlags) { return ZE_RESULT_SUCCESS; };
@@ -356,7 +356,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelGetIndirectAccessTracingWrappe
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelGetNameTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelGetNameTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Kernel.pfnGetName =
         [](ze_kernel_handle_t hKernel, size_t *pSize, char *pName) { return ZE_RESULT_SUCCESS; };
@@ -371,7 +371,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelGetNameTracingWrapperWithOneSe
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelGetSourceAttributesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelGetSourceAttributesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Kernel.pfnGetSourceAttributes =
         [](ze_kernel_handle_t hKernel, uint32_t *pSize, char **pString) { return ZE_RESULT_SUCCESS; };
@@ -386,7 +386,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelGetSourceAttributesTracingWrap
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelSetIndirectAccessTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingKernelSetIndirectAccessTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Kernel.pfnSetIndirectAccess =
         [](ze_kernel_handle_t hKernel, ze_kernel_indirect_access_flags_t flags) { return ZE_RESULT_SUCCESS; };
@@ -401,7 +401,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingKernelSetIndirectAccessTracingWrappe
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleDynamicLinkTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleDynamicLinkTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Module.pfnDynamicLink =
         [](uint32_t numModules, ze_module_handle_t *phModules, ze_module_build_log_handle_t *phLinkLog) { return ZE_RESULT_SUCCESS; };
@@ -416,7 +416,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleDynamicLinkTracingWrapperWithO
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingModuleGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingModuleGetPropertiesTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Module.pfnGetProperties =
         [](ze_module_handle_t hModule, ze_module_properties_t *pModuleProperties) { return ZE_RESULT_SUCCESS; };
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_residency_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_residency_api_tracing.cpp
index 394fa8d732..8606269b2f 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_residency_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_residency_api_tracing.cpp
@@ -10,7 +10,7 @@
 namespace L0 {
 namespace ult {
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingContextCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Context.pfnCreate = [](ze_driver_handle_t hContext, const ze_context_desc_t *desc, ze_context_handle_t *phContext) { return ZE_RESULT_SUCCESS; };
 
@@ -24,7 +24,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingContextCreateTracingWrapperWithOneSe
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingContextDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Context.pfnDestroy = [](ze_context_handle_t hContext) { return ZE_RESULT_SUCCESS; };
 
@@ -38,7 +38,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingContextDestroyTracingWrapperWithOneS
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingContextGetStatusTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextGetStatusTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Context.pfnGetStatus = [](ze_context_handle_t hContext) { return ZE_RESULT_SUCCESS; };
 
@@ -52,7 +52,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingContextGetStatusTracingWrapperWithOn
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingContextSystemBarrierTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextSystemBarrierTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Context.pfnSystemBarrier = [](ze_context_handle_t hContext, ze_device_handle_t hDevice) { return ZE_RESULT_SUCCESS; };
 
@@ -66,7 +66,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingContextSystemBarrierTracingWrapperWi
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingContextMakeMemoryResidentTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextMakeMemoryResidentTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Context.pfnMakeMemoryResident = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, void *ptr, size_t size) { return ZE_RESULT_SUCCESS; };
 
@@ -80,7 +80,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingContextMakeMemoryResidentTracingWrap
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingContextEvictMemoryTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextEvictMemoryTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Context.pfnEvictMemory = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, void *ptr, size_t size) { return ZE_RESULT_SUCCESS; };
 
@@ -94,7 +94,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingContextEvictMemoryTracingWrapperWith
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingContextMakeImageResidentTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextMakeImageResidentTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Context.pfnMakeImageResident = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, ze_image_handle_t hImage) { return ZE_RESULT_SUCCESS; };
 
@@ -108,7 +108,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingContextMakeImageResidentTracingWrapp
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingContextEvictImageTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingContextEvictImageTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Context.pfnEvictImage = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, ze_image_handle_t hImage) { return ZE_RESULT_SUCCESS; };
 
@@ -135,7 +135,7 @@ struct {
     void *instanceData3;
 } MakeMemoryResident_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests,
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests,
        WhenCallingContextMakeMemoryResidentTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
@@ -302,7 +302,7 @@ struct {
     void *instanceData3;
 } EvictMemory_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests, WhenCallingContextEvictMemoryTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests, WhenCallingContextEvictMemoryTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
     // initialize initial argument set
@@ -463,7 +463,7 @@ struct {
     void *instanceData3;
 } MakeImageResident_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests,
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests,
        WhenCallingContextMakeImageResidentTracingWrapperWithMultiplePrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
@@ -618,7 +618,7 @@ struct {
     void *instanceData3;
 } EvictImage_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests,
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests,
        WhenCallingContextMakeImageResidentTracingWrapperWithMultiplefPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
 
diff --git a/level_zero/core/test/unit_tests/sources/tracing/test_sampler_api_tracing.cpp b/level_zero/core/test/unit_tests/sources/tracing/test_sampler_api_tracing.cpp
index 182ae7e941..21d5973c0a 100644
--- a/level_zero/core/test/unit_tests/sources/tracing/test_sampler_api_tracing.cpp
+++ b/level_zero/core/test/unit_tests/sources/tracing/test_sampler_api_tracing.cpp
@@ -10,7 +10,7 @@
 namespace L0 {
 namespace ult {
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingSamplerCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingSamplerCreateTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Sampler.pfnCreate = [](ze_context_handle_t hContext, ze_device_handle_t hDevice, const ze_sampler_desc_t *pDesc, ze_sampler_handle_t *phSampler) { return ZE_RESULT_SUCCESS; };
 
@@ -24,7 +24,7 @@ TEST_F(zeAPITracingRuntimeTests, WhenCallingSamplerCreateTracingWrapperWithOneSe
     EXPECT_EQ(defaultUserData, 1);
 }
 
-TEST_F(zeAPITracingRuntimeTests, WhenCallingSamplerDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
+TEST_F(ZeApiTracingRuntimeTests, WhenCallingSamplerDestroyTracingWrapperWithOneSetOfPrologEpilogsThenReturnSuccess) {
     ze_result_t result;
     driver_ddiTable.core_ddiTable.Sampler.pfnDestroy = [](ze_sampler_handle_t hSampler) { return ZE_RESULT_SUCCESS; };
 
@@ -52,7 +52,7 @@ struct {
     void *instanceData3;
 } sampler_create_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests,
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests,
        WhenCallingSamplerCreateTracingWrapperWithTwoSetsOfPrologEpilogsCheckArgumentsThenReturnSuccess) {
     ze_result_t result;
 
@@ -299,7 +299,7 @@ struct {
     void *instanceData3;
 } sampler_destroy_args;
 
-TEST_F(zeAPITracingRuntimeMultipleArgumentsTests,
+TEST_F(ZeApiTracingRuntimeMultipleArgumentsTests,
        WhenCallingSamplerDestroyTracingWrapperWithTwoSetsOfPrologEpilogsCheckArgumentsThenReturnSuccess) {
     ze_result_t result;
 
diff --git a/opencl/source/api/api.cpp b/opencl/source/api/api.cpp
index 056c05ca20..f5b0cfa3bd 100644
--- a/opencl/source/api/api.cpp
+++ b/opencl/source/api/api.cpp
@@ -62,7 +62,7 @@ using namespace NEO;
 cl_int CL_API_CALL clGetPlatformIDs(cl_uint numEntries,
                                     cl_platform_id *platforms,
                                     cl_uint *numPlatforms) {
-    TRACING_ENTER(clGetPlatformIDs, &numEntries, &platforms, &numPlatforms);
+    TRACING_ENTER(ClGetPlatformIDs, &numEntries, &platforms, &numPlatforms);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("numEntries", numEntries,
@@ -122,7 +122,7 @@ cl_int CL_API_CALL clGetPlatformIDs(cl_uint numEntries,
             *numPlatforms = numPlatformsToExpose;
         }
     } while (false);
-    TRACING_EXIT(clGetPlatformIDs, &retVal);
+    TRACING_EXIT(ClGetPlatformIDs, &retVal);
     return retVal;
 }
 
@@ -143,7 +143,7 @@ cl_int CL_API_CALL clGetPlatformInfo(cl_platform_id platform,
                                      size_t paramValueSize,
                                      void *paramValue,
                                      size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetPlatformInfo, &platform, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetPlatformInfo, &platform, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     cl_int retVal = CL_INVALID_PLATFORM;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("platform", platform,
@@ -156,7 +156,7 @@ cl_int CL_API_CALL clGetPlatformInfo(cl_platform_id platform,
         retVal = pPlatform->getInfo(paramName, paramValueSize,
                                     paramValue, paramValueSizeRet);
     }
-    TRACING_EXIT(clGetPlatformInfo, &retVal);
+    TRACING_EXIT(ClGetPlatformInfo, &retVal);
     return retVal;
 }
 
@@ -178,7 +178,7 @@ cl_int CL_API_CALL clGetDeviceIDs(cl_platform_id platform,
                                   cl_uint numEntries,
                                   cl_device_id *devices,
                                   cl_uint *numDevices) {
-    TRACING_ENTER(clGetDeviceIDs, &platform, &deviceType, &numEntries, &devices, &numDevices);
+    TRACING_ENTER(ClGetDeviceIDs, &platform, &deviceType, &numEntries, &devices, &numDevices);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("platform", platform,
@@ -284,7 +284,7 @@ cl_int CL_API_CALL clGetDeviceIDs(cl_platform_id platform,
         if (retNum == 0)
             retVal = CL_DEVICE_NOT_FOUND;
     } while (false);
-    TRACING_EXIT(clGetDeviceIDs, &retVal);
+    TRACING_EXIT(ClGetDeviceIDs, &retVal);
     return retVal;
 }
 
@@ -293,7 +293,7 @@ cl_int CL_API_CALL clGetDeviceInfo(cl_device_id device,
                                    size_t paramValueSize,
                                    void *paramValue,
                                    size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetDeviceInfo, &device, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetDeviceInfo, &device, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     cl_int retVal = CL_INVALID_DEVICE;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("clDevice", device, "paramName", paramName, "paramValueSize", paramValueSize, "paramValue", NEO::fileLoggerInstance().infoPointerToString(paramValue, paramValueSize), "paramValueSizeRet", paramValueSizeRet);
@@ -303,7 +303,7 @@ cl_int CL_API_CALL clGetDeviceInfo(cl_device_id device,
         retVal = pDevice->getDeviceInfo(paramName, paramValueSize,
                                         paramValue, paramValueSizeRet);
     }
-    TRACING_EXIT(clGetDeviceInfo, &retVal);
+    TRACING_EXIT(ClGetDeviceInfo, &retVal);
     return retVal;
 }
 
@@ -350,7 +350,7 @@ cl_int CL_API_CALL clCreateSubDevices(cl_device_id inDevice,
 }
 
 cl_int CL_API_CALL clRetainDevice(cl_device_id device) {
-    TRACING_ENTER(clRetainDevice, &device);
+    TRACING_ENTER(ClRetainDevice, &device);
     cl_int retVal = CL_INVALID_DEVICE;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("device", device);
@@ -360,12 +360,12 @@ cl_int CL_API_CALL clRetainDevice(cl_device_id device) {
         retVal = CL_SUCCESS;
     }
 
-    TRACING_EXIT(clRetainDevice, &retVal);
+    TRACING_EXIT(ClRetainDevice, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clReleaseDevice(cl_device_id device) {
-    TRACING_ENTER(clReleaseDevice, &device);
+    TRACING_ENTER(ClReleaseDevice, &device);
     cl_int retVal = CL_INVALID_DEVICE;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("device", device);
@@ -375,7 +375,7 @@ cl_int CL_API_CALL clReleaseDevice(cl_device_id device) {
         retVal = CL_SUCCESS;
     }
 
-    TRACING_EXIT(clReleaseDevice, &retVal);
+    TRACING_EXIT(ClReleaseDevice, &retVal);
     return retVal;
 }
 
@@ -386,7 +386,7 @@ cl_context CL_API_CALL clCreateContext(const cl_context_properties *properties,
                                                                      size_t, void *),
                                        void *userData,
                                        cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateContext, &properties, &numDevices, &devices, &funcNotify, &userData, &errcodeRet);
+    TRACING_ENTER(ClCreateContext, &properties, &numDevices, &devices, &funcNotify, &userData, &errcodeRet);
 
     cl_int retVal = CL_SUCCESS;
     cl_context context = nullptr;
@@ -433,7 +433,7 @@ cl_context CL_API_CALL clCreateContext(const cl_context_properties *properties,
     if (errcodeRet) {
         *errcodeRet = retVal;
     }
-    TRACING_EXIT(clCreateContext, &context);
+    TRACING_EXIT(ClCreateContext, &context);
     return context;
 }
 
@@ -443,7 +443,7 @@ cl_context CL_API_CALL clCreateContextFromType(const cl_context_properties *prop
                                                                              size_t, void *),
                                                void *userData,
                                                cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateContextFromType, &properties, &deviceType, &funcNotify, &userData, &errcodeRet);
+    TRACING_ENTER(ClCreateContextFromType, &properties, &deviceType, &funcNotify, &userData, &errcodeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("properties", properties, "deviceType", deviceType, "funcNotify", funcNotify, "userData", userData);
@@ -478,39 +478,39 @@ cl_context CL_API_CALL clCreateContextFromType(const cl_context_properties *prop
     if (errcodeRet) {
         *errcodeRet = retVal;
     }
-    TRACING_EXIT(clCreateContextFromType, (cl_context *)&pContext);
+    TRACING_EXIT(ClCreateContextFromType, (cl_context *)&pContext);
     return pContext;
 }
 
 cl_int CL_API_CALL clRetainContext(cl_context context) {
-    TRACING_ENTER(clRetainContext, &context);
+    TRACING_ENTER(ClRetainContext, &context);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("context", context);
     Context *pContext = castToObject<Context>(context);
     if (pContext) {
         pContext->retain();
-        TRACING_EXIT(clRetainContext, &retVal);
+        TRACING_EXIT(ClRetainContext, &retVal);
         return retVal;
     }
     retVal = CL_INVALID_CONTEXT;
-    TRACING_EXIT(clRetainContext, &retVal);
+    TRACING_EXIT(ClRetainContext, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clReleaseContext(cl_context context) {
-    TRACING_ENTER(clReleaseContext, &context);
+    TRACING_ENTER(ClReleaseContext, &context);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("context", context);
     Context *pContext = castToObject<Context>(context);
     if (pContext) {
         pContext->release();
-        TRACING_EXIT(clReleaseContext, &retVal);
+        TRACING_EXIT(ClReleaseContext, &retVal);
         return retVal;
     }
     retVal = CL_INVALID_CONTEXT;
-    TRACING_EXIT(clReleaseContext, &retVal);
+    TRACING_EXIT(ClReleaseContext, &retVal);
     return retVal;
 }
 
@@ -519,7 +519,7 @@ cl_int CL_API_CALL clGetContextInfo(cl_context context,
                                     size_t paramValueSize,
                                     void *paramValue,
                                     size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetContextInfo, &context, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetContextInfo, &context, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     auto retVal = CL_INVALID_CONTEXT;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("context", context,
@@ -534,7 +534,7 @@ cl_int CL_API_CALL clGetContextInfo(cl_context context,
                                    paramValue, paramValueSizeRet);
     }
 
-    TRACING_EXIT(clGetContextInfo, &retVal);
+    TRACING_EXIT(ClGetContextInfo, &retVal);
     return retVal;
 }
 
@@ -542,7 +542,7 @@ cl_command_queue CL_API_CALL clCreateCommandQueue(cl_context context,
                                                   cl_device_id device,
                                                   const cl_command_queue_properties properties,
                                                   cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateCommandQueue, &context, &device, (cl_command_queue_properties *)&properties, &errcodeRet);
+    TRACING_ENTER(ClCreateCommandQueue, &context, &device, (cl_command_queue_properties *)&properties, &errcodeRet);
     cl_command_queue commandQueue = nullptr;
     ErrorCodeHelper err(errcodeRet, CL_SUCCESS);
     cl_int retVal = CL_SUCCESS;
@@ -596,38 +596,38 @@ cl_command_queue CL_API_CALL clCreateCommandQueue(cl_context context,
 
     err.set(retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue);
-    TRACING_EXIT(clCreateCommandQueue, &commandQueue);
+    TRACING_EXIT(ClCreateCommandQueue, &commandQueue);
     return commandQueue;
 }
 
 cl_int CL_API_CALL clRetainCommandQueue(cl_command_queue commandQueue) {
-    TRACING_ENTER(clRetainCommandQueue, &commandQueue);
+    TRACING_ENTER(ClRetainCommandQueue, &commandQueue);
     cl_int retVal = CL_INVALID_COMMAND_QUEUE;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue);
     retainQueue(commandQueue, retVal);
     if (retVal == CL_SUCCESS) {
-        TRACING_EXIT(clRetainCommandQueue, &retVal);
+        TRACING_EXIT(ClRetainCommandQueue, &retVal);
         return retVal;
     }
 
-    TRACING_EXIT(clRetainCommandQueue, &retVal);
+    TRACING_EXIT(ClRetainCommandQueue, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clReleaseCommandQueue(cl_command_queue commandQueue) {
-    TRACING_ENTER(clReleaseCommandQueue, &commandQueue);
+    TRACING_ENTER(ClReleaseCommandQueue, &commandQueue);
     cl_int retVal = CL_INVALID_COMMAND_QUEUE;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue);
 
     releaseQueue(commandQueue, retVal);
     if (retVal == CL_SUCCESS) {
-        TRACING_EXIT(clReleaseCommandQueue, &retVal);
+        TRACING_EXIT(ClReleaseCommandQueue, &retVal);
         return retVal;
     }
 
-    TRACING_EXIT(clReleaseCommandQueue, &retVal);
+    TRACING_EXIT(ClReleaseCommandQueue, &retVal);
     return retVal;
 }
 
@@ -636,7 +636,7 @@ cl_int CL_API_CALL clGetCommandQueueInfo(cl_command_queue commandQueue,
                                          size_t paramValueSize,
                                          void *paramValue,
                                          size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetCommandQueueInfo, &commandQueue, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetCommandQueueInfo, &commandQueue, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     cl_int retVal = CL_INVALID_COMMAND_QUEUE;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue,
@@ -648,11 +648,11 @@ cl_int CL_API_CALL clGetCommandQueueInfo(cl_command_queue commandQueue,
     getQueueInfo(commandQueue, paramName, paramValueSize, paramValue, paramValueSizeRet, retVal);
     // if host queue not found - try to query device queue
     if (retVal == CL_SUCCESS) {
-        TRACING_EXIT(clGetCommandQueueInfo, &retVal);
+        TRACING_EXIT(ClGetCommandQueueInfo, &retVal);
         return retVal;
     }
 
-    TRACING_EXIT(clGetCommandQueueInfo, &retVal);
+    TRACING_EXIT(ClGetCommandQueueInfo, &retVal);
     return retVal;
 }
 
@@ -661,14 +661,14 @@ cl_int CL_API_CALL clSetCommandQueueProperty(cl_command_queue commandQueue,
                                              cl_command_queue_properties properties,
                                              cl_bool enable,
                                              cl_command_queue_properties *oldProperties) {
-    TRACING_ENTER(clSetCommandQueueProperty, &commandQueue, &properties, &enable, &oldProperties);
+    TRACING_ENTER(ClSetCommandQueueProperty, &commandQueue, &properties, &enable, &oldProperties);
     cl_int retVal = CL_INVALID_VALUE;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue,
                    "properties", properties,
                    "enable", enable,
                    "oldProperties", oldProperties);
-    TRACING_EXIT(clSetCommandQueueProperty, &retVal);
+    TRACING_EXIT(ClSetCommandQueueProperty, &retVal);
     return retVal;
 }
 
@@ -681,7 +681,7 @@ cl_mem CL_API_CALL clCreateBuffer(cl_context context,
         size += (MemoryConstants::pageSize * DebugManager.flags.ForceExtendedBufferSize.get());
     }
 
-    TRACING_ENTER(clCreateBuffer, &context, &flags, &size, &hostPtr, &errcodeRet);
+    TRACING_ENTER(ClCreateBuffer, &context, &flags, &size, &hostPtr, &errcodeRet);
     DBG_LOG_INPUTS("cl_context", context,
                    "cl_mem_flags", flags,
                    "size", size,
@@ -696,7 +696,7 @@ cl_mem CL_API_CALL clCreateBuffer(cl_context context,
 
     ErrorCodeHelper{errcodeRet, retVal};
     DBG_LOG_INPUTS("buffer", buffer);
-    TRACING_EXIT(clCreateBuffer, &buffer);
+    TRACING_EXIT(ClCreateBuffer, &buffer);
     return buffer;
 }
 
@@ -759,7 +759,7 @@ cl_mem CL_API_CALL clCreateSubBuffer(cl_mem buffer,
                                      cl_buffer_create_type bufferCreateType,
                                      const void *bufferCreateInfo,
                                      cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateSubBuffer, &buffer, &flags, &bufferCreateType, &bufferCreateInfo, &errcodeRet);
+    TRACING_ENTER(ClCreateSubBuffer, &buffer, &flags, &bufferCreateType, &bufferCreateInfo, &errcodeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("buffer", buffer,
@@ -855,7 +855,7 @@ cl_mem CL_API_CALL clCreateSubBuffer(cl_mem buffer,
         *errcodeRet = retVal;
     }
 
-    TRACING_EXIT(clCreateSubBuffer, &subBuffer);
+    TRACING_EXIT(ClCreateSubBuffer, &subBuffer);
     return subBuffer;
 }
 
@@ -865,7 +865,7 @@ cl_mem CL_API_CALL clCreateImage(cl_context context,
                                  const cl_image_desc *imageDesc,
                                  void *hostPtr,
                                  cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateImage, &context, &flags, &imageFormat, &imageDesc, &hostPtr, &errcodeRet);
+    TRACING_ENTER(ClCreateImage, &context, &flags, &imageFormat, &imageDesc, &hostPtr, &errcodeRet);
 
     DBG_LOG_INPUTS("cl_context", context,
                    "cl_mem_flags", flags,
@@ -893,7 +893,7 @@ cl_mem CL_API_CALL clCreateImage(cl_context context,
 
     ErrorCodeHelper{errcodeRet, retVal};
     DBG_LOG_INPUTS("image", image);
-    TRACING_EXIT(clCreateImage, &image);
+    TRACING_EXIT(ClCreateImage, &image);
     return image;
 }
 
@@ -974,7 +974,7 @@ cl_mem CL_API_CALL clCreateImage2D(cl_context context,
                                    size_t imageRowPitch,
                                    void *hostPtr,
                                    cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateImage2D, &context, &flags, &imageFormat, &imageWidth, &imageHeight, &imageRowPitch, &hostPtr, &errcodeRet);
+    TRACING_ENTER(ClCreateImage2D, &context, &flags, &imageFormat, &imageWidth, &imageHeight, &imageRowPitch, &hostPtr, &errcodeRet);
 
     DBG_LOG_INPUTS("context", context,
                    "flags", flags,
@@ -1007,7 +1007,7 @@ cl_mem CL_API_CALL clCreateImage2D(cl_context context,
 
     ErrorCodeHelper{errcodeRet, retVal};
     DBG_LOG_INPUTS("image 2D", image2D);
-    TRACING_EXIT(clCreateImage2D, &image2D);
+    TRACING_EXIT(ClCreateImage2D, &image2D);
     return image2D;
 }
 
@@ -1022,7 +1022,7 @@ cl_mem CL_API_CALL clCreateImage3D(cl_context context,
                                    size_t imageSlicePitch,
                                    void *hostPtr,
                                    cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateImage3D, &context, &flags, &imageFormat, &imageWidth, &imageHeight, &imageDepth, &imageRowPitch, &imageSlicePitch, &hostPtr, &errcodeRet);
+    TRACING_ENTER(ClCreateImage3D, &context, &flags, &imageFormat, &imageWidth, &imageHeight, &imageDepth, &imageRowPitch, &imageSlicePitch, &hostPtr, &errcodeRet);
 
     DBG_LOG_INPUTS("context", context,
                    "flags", flags,
@@ -1059,12 +1059,12 @@ cl_mem CL_API_CALL clCreateImage3D(cl_context context,
 
     ErrorCodeHelper{errcodeRet, retVal};
     DBG_LOG_INPUTS("image 3D", image3D);
-    TRACING_EXIT(clCreateImage3D, &image3D);
+    TRACING_EXIT(ClCreateImage3D, &image3D);
     return image3D;
 }
 
 cl_int CL_API_CALL clRetainMemObject(cl_mem memobj) {
-    TRACING_ENTER(clRetainMemObject, &memobj);
+    TRACING_ENTER(ClRetainMemObject, &memobj);
     cl_int retVal = CL_INVALID_MEM_OBJECT;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("memobj", memobj);
@@ -1074,16 +1074,16 @@ cl_int CL_API_CALL clRetainMemObject(cl_mem memobj) {
     if (pMemObj) {
         pMemObj->retain();
         retVal = CL_SUCCESS;
-        TRACING_EXIT(clRetainMemObject, &retVal);
+        TRACING_EXIT(ClRetainMemObject, &retVal);
         return retVal;
     }
 
-    TRACING_EXIT(clRetainMemObject, &retVal);
+    TRACING_EXIT(ClRetainMemObject, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clReleaseMemObject(cl_mem memobj) {
-    TRACING_ENTER(clReleaseMemObject, &memobj);
+    TRACING_ENTER(ClReleaseMemObject, &memobj);
     cl_int retVal = CL_INVALID_MEM_OBJECT;
     API_ENTER(&retVal);
 
@@ -1093,11 +1093,11 @@ cl_int CL_API_CALL clReleaseMemObject(cl_mem memobj) {
     if (pMemObj) {
         pMemObj->release();
         retVal = CL_SUCCESS;
-        TRACING_EXIT(clReleaseMemObject, &retVal);
+        TRACING_EXIT(ClReleaseMemObject, &retVal);
         return retVal;
     }
 
-    TRACING_EXIT(clReleaseMemObject, &retVal);
+    TRACING_EXIT(ClReleaseMemObject, &retVal);
     return retVal;
 }
 
@@ -1107,7 +1107,7 @@ cl_int CL_API_CALL clGetSupportedImageFormats(cl_context context,
                                               cl_uint numEntries,
                                               cl_image_format *imageFormats,
                                               cl_uint *numImageFormats) {
-    TRACING_ENTER(clGetSupportedImageFormats, &context, &flags, &imageType, &numEntries, &imageFormats, &numImageFormats);
+    TRACING_ENTER(ClGetSupportedImageFormats, &context, &flags, &imageType, &numEntries, &imageFormats, &numImageFormats);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("context", context,
@@ -1132,7 +1132,7 @@ cl_int CL_API_CALL clGetSupportedImageFormats(cl_context context,
         retVal = CL_INVALID_CONTEXT;
     }
 
-    TRACING_EXIT(clGetSupportedImageFormats, &retVal);
+    TRACING_EXIT(ClGetSupportedImageFormats, &retVal);
     return retVal;
 }
 
@@ -1141,7 +1141,7 @@ cl_int CL_API_CALL clGetMemObjectInfo(cl_mem memobj,
                                       size_t paramValueSize,
                                       void *paramValue,
                                       size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetMemObjectInfo, &memobj, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetMemObjectInfo, &memobj, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("memobj", memobj,
@@ -1152,13 +1152,13 @@ cl_int CL_API_CALL clGetMemObjectInfo(cl_mem memobj,
     MemObj *pMemObj = nullptr;
     retVal = validateObjects(withCastToInternal(memobj, &pMemObj));
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clGetMemObjectInfo, &retVal);
+        TRACING_EXIT(ClGetMemObjectInfo, &retVal);
         return retVal;
     }
 
     retVal = pMemObj->getMemObjectInfo(paramName, paramValueSize,
                                        paramValue, paramValueSizeRet);
-    TRACING_EXIT(clGetMemObjectInfo, &retVal);
+    TRACING_EXIT(ClGetMemObjectInfo, &retVal);
     return retVal;
 }
 
@@ -1167,7 +1167,7 @@ cl_int CL_API_CALL clGetImageInfo(cl_mem image,
                                   size_t paramValueSize,
                                   void *paramValue,
                                   size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetImageInfo, &image, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetImageInfo, &image, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("image", image,
@@ -1177,19 +1177,19 @@ cl_int CL_API_CALL clGetImageInfo(cl_mem image,
                    "paramValueSizeRet", paramValueSizeRet);
     retVal = validateObjects(image);
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clGetImageInfo, &retVal);
+        TRACING_EXIT(ClGetImageInfo, &retVal);
         return retVal;
     }
 
     auto pImgObj = castToObject<Image>(image);
     if (pImgObj == nullptr) {
         retVal = CL_INVALID_MEM_OBJECT;
-        TRACING_EXIT(clGetImageInfo, &retVal);
+        TRACING_EXIT(ClGetImageInfo, &retVal);
         return retVal;
     }
 
     retVal = pImgObj->getImageInfo(paramName, paramValueSize, paramValue, paramValueSizeRet);
-    TRACING_EXIT(clGetImageInfo, &retVal);
+    TRACING_EXIT(ClGetImageInfo, &retVal);
     return retVal;
 }
 
@@ -1234,20 +1234,20 @@ cl_int CL_API_CALL clGetImageParamsINTEL(cl_context context,
 cl_int CL_API_CALL clSetMemObjectDestructorCallback(cl_mem memobj,
                                                     void(CL_CALLBACK *funcNotify)(cl_mem, void *),
                                                     void *userData) {
-    TRACING_ENTER(clSetMemObjectDestructorCallback, &memobj, &funcNotify, &userData);
+    TRACING_ENTER(ClSetMemObjectDestructorCallback, &memobj, &funcNotify, &userData);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("memobj", memobj, "funcNotify", funcNotify, "userData", userData);
     retVal = validateObjects(memobj, (void *)funcNotify);
 
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clSetMemObjectDestructorCallback, &retVal);
+        TRACING_EXIT(ClSetMemObjectDestructorCallback, &retVal);
         return retVal;
     }
 
     auto pMemObj = castToObject<MemObj>(memobj);
     retVal = pMemObj->setDestructorCallback(funcNotify, userData);
-    TRACING_EXIT(clSetMemObjectDestructorCallback, &retVal);
+    TRACING_EXIT(ClSetMemObjectDestructorCallback, &retVal);
     return retVal;
 }
 
@@ -1256,7 +1256,7 @@ cl_sampler CL_API_CALL clCreateSampler(cl_context context,
                                        cl_addressing_mode addressingMode,
                                        cl_filter_mode filterMode,
                                        cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateSampler, &context, &normalizedCoords, &addressingMode, &filterMode, &errcodeRet);
+    TRACING_ENTER(ClCreateSampler, &context, &normalizedCoords, &addressingMode, &filterMode, &errcodeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("context", context,
@@ -1283,39 +1283,39 @@ cl_sampler CL_API_CALL clCreateSampler(cl_context context,
         *errcodeRet = retVal;
     }
 
-    TRACING_EXIT(clCreateSampler, &sampler);
+    TRACING_EXIT(ClCreateSampler, &sampler);
     return sampler;
 }
 
 cl_int CL_API_CALL clRetainSampler(cl_sampler sampler) {
-    TRACING_ENTER(clRetainSampler, &sampler);
+    TRACING_ENTER(ClRetainSampler, &sampler);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("sampler", sampler);
     auto pSampler = castToObject<Sampler>(sampler);
     if (pSampler) {
         pSampler->retain();
-        TRACING_EXIT(clRetainSampler, &retVal);
+        TRACING_EXIT(ClRetainSampler, &retVal);
         return retVal;
     }
     retVal = CL_INVALID_SAMPLER;
-    TRACING_EXIT(clRetainSampler, &retVal);
+    TRACING_EXIT(ClRetainSampler, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clReleaseSampler(cl_sampler sampler) {
-    TRACING_ENTER(clReleaseSampler, &sampler);
+    TRACING_ENTER(ClReleaseSampler, &sampler);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("sampler", sampler);
     auto pSampler = castToObject<Sampler>(sampler);
     if (pSampler) {
         pSampler->release();
-        TRACING_EXIT(clReleaseSampler, &retVal);
+        TRACING_EXIT(ClReleaseSampler, &retVal);
         return retVal;
     }
     retVal = CL_INVALID_SAMPLER;
-    TRACING_EXIT(clReleaseSampler, &retVal);
+    TRACING_EXIT(ClReleaseSampler, &retVal);
     return retVal;
 }
 
@@ -1324,7 +1324,7 @@ cl_int CL_API_CALL clGetSamplerInfo(cl_sampler sampler,
                                     size_t paramValueSize,
                                     void *paramValue,
                                     size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetSamplerInfo, &sampler, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetSamplerInfo, &sampler, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     cl_int retVal = CL_INVALID_SAMPLER;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("sampler", sampler,
@@ -1340,7 +1340,7 @@ cl_int CL_API_CALL clGetSamplerInfo(cl_sampler sampler,
                                    paramValue, paramValueSizeRet);
     }
 
-    TRACING_EXIT(clGetSamplerInfo, &retVal);
+    TRACING_EXIT(ClGetSamplerInfo, &retVal);
     return retVal;
 }
 
@@ -1349,7 +1349,7 @@ cl_program CL_API_CALL clCreateProgramWithSource(cl_context context,
                                                  const char **strings,
                                                  const size_t *lengths,
                                                  cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateProgramWithSource, &context, &count, &strings, &lengths, &errcodeRet);
+    TRACING_ENTER(ClCreateProgramWithSource, &context, &count, &strings, &lengths, &errcodeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("context", context,
@@ -1373,7 +1373,7 @@ cl_program CL_API_CALL clCreateProgramWithSource(cl_context context,
         *errcodeRet = retVal;
     }
 
-    TRACING_EXIT(clCreateProgramWithSource, &program);
+    TRACING_EXIT(ClCreateProgramWithSource, &program);
     return program;
 }
 
@@ -1384,7 +1384,7 @@ cl_program CL_API_CALL clCreateProgramWithBinary(cl_context context,
                                                  const unsigned char **binaries,
                                                  cl_int *binaryStatus,
                                                  cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateProgramWithBinary, &context, &numDevices, &deviceList, &lengths, &binaries, &binaryStatus, &errcodeRet);
+    TRACING_ENTER(ClCreateProgramWithBinary, &context, &numDevices, &deviceList, &lengths, &binaries, &binaryStatus, &errcodeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("context", context,
@@ -1429,7 +1429,7 @@ cl_program CL_API_CALL clCreateProgramWithBinary(cl_context context,
         *errcodeRet = retVal;
     }
 
-    TRACING_EXIT(clCreateProgramWithBinary, &program);
+    TRACING_EXIT(ClCreateProgramWithBinary, &program);
     return program;
 }
 
@@ -1437,7 +1437,7 @@ cl_program CL_API_CALL clCreateProgramWithIL(cl_context context,
                                              const void *il,
                                              size_t length,
                                              cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateProgramWithIL, &context, &il, &length, &errcodeRet);
+    TRACING_ENTER(ClCreateProgramWithIl, &context, &il, &length, &errcodeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("context", context,
@@ -1459,7 +1459,7 @@ cl_program CL_API_CALL clCreateProgramWithIL(cl_context context,
         *errcodeRet = retVal;
     }
 
-    TRACING_EXIT(clCreateProgramWithIL, &program);
+    TRACING_EXIT(ClCreateProgramWithIl, &program);
     return program;
 }
 
@@ -1468,7 +1468,7 @@ cl_program CL_API_CALL clCreateProgramWithBuiltInKernels(cl_context context,
                                                          const cl_device_id *deviceList,
                                                          const char *kernelNames,
                                                          cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateProgramWithBuiltInKernels, &context, &numDevices, &deviceList, &kernelNames, &errcodeRet);
+    TRACING_ENTER(ClCreateProgramWithBuiltInKernels, &context, &numDevices, &deviceList, &kernelNames, &errcodeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("context", context,
@@ -1505,39 +1505,39 @@ cl_program CL_API_CALL clCreateProgramWithBuiltInKernels(cl_context context,
         *errcodeRet = retVal;
     }
 
-    TRACING_EXIT(clCreateProgramWithBuiltInKernels, &program);
+    TRACING_EXIT(ClCreateProgramWithBuiltInKernels, &program);
     return program;
 }
 
 cl_int CL_API_CALL clRetainProgram(cl_program program) {
-    TRACING_ENTER(clRetainProgram, &program);
+    TRACING_ENTER(ClRetainProgram, &program);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("program", program);
     auto pProgram = castToObject<Program>(program);
     if (pProgram) {
         pProgram->retain();
-        TRACING_EXIT(clRetainProgram, &retVal);
+        TRACING_EXIT(ClRetainProgram, &retVal);
         return retVal;
     }
     retVal = CL_INVALID_PROGRAM;
-    TRACING_EXIT(clRetainProgram, &retVal);
+    TRACING_EXIT(ClRetainProgram, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clReleaseProgram(cl_program program) {
-    TRACING_ENTER(clReleaseProgram, &program);
+    TRACING_ENTER(ClReleaseProgram, &program);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("program", program);
     auto pProgram = castToObject<Program>(program);
     if (pProgram) {
         pProgram->release();
-        TRACING_EXIT(clReleaseProgram, &retVal);
+        TRACING_EXIT(ClReleaseProgram, &retVal);
         return retVal;
     }
     retVal = CL_INVALID_PROGRAM;
-    TRACING_EXIT(clReleaseProgram, &retVal);
+    TRACING_EXIT(ClReleaseProgram, &retVal);
     return retVal;
 }
 
@@ -1547,7 +1547,7 @@ cl_int CL_API_CALL clBuildProgram(cl_program program,
                                   const char *options,
                                   void(CL_CALLBACK *funcNotify)(cl_program program, void *userData),
                                   void *userData) {
-    TRACING_ENTER(clBuildProgram, &program, &numDevices, &deviceList, &options, &funcNotify, &userData);
+    TRACING_ENTER(ClBuildProgram, &program, &numDevices, &deviceList, &options, &funcNotify, &userData);
     cl_int retVal = CL_INVALID_PROGRAM;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("clProgram", program, "numDevices", numDevices, "cl_device_id", deviceList, "options", (options != nullptr) ? options : "", "funcNotify", funcNotify, "userData", userData);
@@ -1572,7 +1572,7 @@ cl_int CL_API_CALL clBuildProgram(cl_program program,
         pProgram->invokeCallback(funcNotify, userData);
     }
 
-    TRACING_EXIT(clBuildProgram, &retVal);
+    TRACING_EXIT(ClBuildProgram, &retVal);
     return retVal;
 }
 
@@ -1585,7 +1585,7 @@ cl_int CL_API_CALL clCompileProgram(cl_program program,
                                     const char **headerIncludeNames,
                                     void(CL_CALLBACK *funcNotify)(cl_program program, void *userData),
                                     void *userData) {
-    TRACING_ENTER(clCompileProgram, &program, &numDevices, &deviceList, &options, &numInputHeaders, &inputHeaders, &headerIncludeNames, &funcNotify, &userData);
+    TRACING_ENTER(ClCompileProgram, &program, &numDevices, &deviceList, &options, &numInputHeaders, &inputHeaders, &headerIncludeNames, &funcNotify, &userData);
     cl_int retVal = CL_INVALID_PROGRAM;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("clProgram", program, "numDevices", numDevices, "cl_device_id", deviceList, "options", (options != nullptr) ? options : "", "numInputHeaders", numInputHeaders);
@@ -1612,7 +1612,7 @@ cl_int CL_API_CALL clCompileProgram(cl_program program,
         pProgram->invokeCallback(funcNotify, userData);
     }
 
-    TRACING_EXIT(clCompileProgram, &retVal);
+    TRACING_EXIT(ClCompileProgram, &retVal);
     return retVal;
 }
 
@@ -1625,7 +1625,7 @@ cl_program CL_API_CALL clLinkProgram(cl_context context,
                                      void(CL_CALLBACK *funcNotify)(cl_program program, void *userData),
                                      void *userData,
                                      cl_int *errcodeRet) {
-    TRACING_ENTER(clLinkProgram, &context, &numDevices, &deviceList, &options, &numInputPrograms, &inputPrograms, &funcNotify, &userData, &errcodeRet);
+    TRACING_ENTER(ClLinkProgram, &context, &numDevices, &deviceList, &options, &numInputPrograms, &inputPrograms, &funcNotify, &userData, &errcodeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("cl_context", context, "numDevices", numDevices, "cl_device_id", deviceList, "options", (options != nullptr) ? options : "", "numInputPrograms", numInputPrograms);
@@ -1652,19 +1652,19 @@ cl_program CL_API_CALL clLinkProgram(cl_context context,
 
     err.set(retVal);
 
-    TRACING_EXIT(clLinkProgram, (cl_program *)&pProgram);
+    TRACING_EXIT(ClLinkProgram, (cl_program *)&pProgram);
     return pProgram;
 }
 
 cl_int CL_API_CALL clUnloadPlatformCompiler(cl_platform_id platform) {
-    TRACING_ENTER(clUnloadPlatformCompiler, &platform);
+    TRACING_ENTER(ClUnloadPlatformCompiler, &platform);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("platform", platform);
 
     retVal = validateObject(platform);
 
-    TRACING_EXIT(clUnloadPlatformCompiler, &retVal);
+    TRACING_EXIT(ClUnloadPlatformCompiler, &retVal);
     return retVal;
 }
 
@@ -1673,7 +1673,7 @@ cl_int CL_API_CALL clGetProgramInfo(cl_program program,
                                     size_t paramValueSize,
                                     void *paramValue,
                                     size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetProgramInfo, &program, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetProgramInfo, &program, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("clProgram", program, "paramName", paramName,
@@ -1691,7 +1691,7 @@ cl_int CL_API_CALL clGetProgramInfo(cl_program program,
             paramValue,
             paramValueSizeRet);
     }
-    TRACING_EXIT(clGetProgramInfo, &retVal);
+    TRACING_EXIT(ClGetProgramInfo, &retVal);
     return retVal;
 }
 
@@ -1701,7 +1701,7 @@ cl_int CL_API_CALL clGetProgramBuildInfo(cl_program program,
                                          size_t paramValueSize,
                                          void *paramValue,
                                          size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetProgramBuildInfo, &program, &device, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetProgramBuildInfo, &program, &device, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("clProgram", program, "cl_device_id", device,
@@ -1726,14 +1726,14 @@ cl_int CL_API_CALL clGetProgramBuildInfo(cl_program program,
             paramValue,
             paramValueSizeRet);
     }
-    TRACING_EXIT(clGetProgramBuildInfo, &retVal);
+    TRACING_EXIT(ClGetProgramBuildInfo, &retVal);
     return retVal;
 }
 
 cl_kernel CL_API_CALL clCreateKernel(cl_program clProgram,
                                      const char *kernelName,
                                      cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateKernel, &clProgram, &kernelName, &errcodeRet);
+    TRACING_ENTER(ClCreateKernel, &clProgram, &kernelName, &errcodeRet);
     API_ENTER(errcodeRet);
     Program *pProgram = nullptr;
     cl_kernel kernel = nullptr;
@@ -1787,7 +1787,7 @@ cl_kernel CL_API_CALL clCreateKernel(cl_program clProgram,
         *errcodeRet = retVal;
     }
     gtpinNotifyKernelCreate(kernel);
-    TRACING_EXIT(clCreateKernel, &kernel);
+    TRACING_EXIT(ClCreateKernel, &kernel);
     return kernel;
 }
 
@@ -1795,7 +1795,7 @@ cl_int CL_API_CALL clCreateKernelsInProgram(cl_program clProgram,
                                             cl_uint numKernels,
                                             cl_kernel *kernels,
                                             cl_uint *numKernelsRet) {
-    TRACING_ENTER(clCreateKernelsInProgram, &clProgram, &numKernels, &kernels, &numKernelsRet);
+    TRACING_ENTER(ClCreateKernelsInProgram, &clProgram, &numKernels, &kernels, &numKernelsRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("clProgram", clProgram,
@@ -1809,7 +1809,7 @@ cl_int CL_API_CALL clCreateKernelsInProgram(cl_program clProgram,
         if (kernels) {
             if (numKernels < numKernelsInProgram) {
                 retVal = CL_INVALID_VALUE;
-                TRACING_EXIT(clCreateKernelsInProgram, &retVal);
+                TRACING_EXIT(ClCreateKernelsInProgram, &retVal);
                 return retVal;
             }
 
@@ -1833,43 +1833,43 @@ cl_int CL_API_CALL clCreateKernelsInProgram(cl_program clProgram,
         if (numKernelsRet) {
             *numKernelsRet = static_cast<cl_uint>(numKernelsInProgram);
         }
-        TRACING_EXIT(clCreateKernelsInProgram, &retVal);
+        TRACING_EXIT(ClCreateKernelsInProgram, &retVal);
         return retVal;
     }
     retVal = CL_INVALID_PROGRAM;
-    TRACING_EXIT(clCreateKernelsInProgram, &retVal);
+    TRACING_EXIT(ClCreateKernelsInProgram, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clRetainKernel(cl_kernel kernel) {
-    TRACING_ENTER(clRetainKernel, &kernel);
+    TRACING_ENTER(ClRetainKernel, &kernel);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("kernel", kernel);
     auto pMultiDeviceKernel = castToObject<MultiDeviceKernel>(kernel);
     if (pMultiDeviceKernel) {
         pMultiDeviceKernel->retain();
-        TRACING_EXIT(clRetainKernel, &retVal);
+        TRACING_EXIT(ClRetainKernel, &retVal);
         return retVal;
     }
     retVal = CL_INVALID_KERNEL;
-    TRACING_EXIT(clRetainKernel, &retVal);
+    TRACING_EXIT(ClRetainKernel, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clReleaseKernel(cl_kernel kernel) {
-    TRACING_ENTER(clReleaseKernel, &kernel);
+    TRACING_ENTER(ClReleaseKernel, &kernel);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("kernel", kernel);
     auto pMultiDeviceKernel = castToObject<MultiDeviceKernel>(kernel);
     if (pMultiDeviceKernel) {
         pMultiDeviceKernel->release();
-        TRACING_EXIT(clReleaseKernel, &retVal);
+        TRACING_EXIT(ClReleaseKernel, &retVal);
         return retVal;
     }
     retVal = CL_INVALID_KERNEL;
-    TRACING_EXIT(clReleaseKernel, &retVal);
+    TRACING_EXIT(ClReleaseKernel, &retVal);
     return retVal;
 }
 
@@ -1877,7 +1877,7 @@ cl_int CL_API_CALL clSetKernelArg(cl_kernel kernel,
                                   cl_uint argIndex,
                                   size_t argSize,
                                   const void *argValue) {
-    TRACING_ENTER(clSetKernelArg, &kernel, &argIndex, &argSize, &argValue);
+    TRACING_ENTER(ClSetKernelArg, &kernel, &argIndex, &argSize, &argValue);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     MultiDeviceKernel *pMultiDeviceKernel = nullptr;
@@ -1904,7 +1904,7 @@ cl_int CL_API_CALL clSetKernelArg(cl_kernel kernel,
         break;
 
     } while (false);
-    TRACING_EXIT(clSetKernelArg, &retVal);
+    TRACING_EXIT(ClSetKernelArg, &retVal);
     return retVal;
 }
 
@@ -1913,7 +1913,7 @@ cl_int CL_API_CALL clGetKernelInfo(cl_kernel kernel,
                                    size_t paramValueSize,
                                    void *paramValue,
                                    size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetKernelInfo, &kernel, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetKernelInfo, &kernel, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("kernel", kernel, "paramName", paramName,
@@ -1929,7 +1929,7 @@ cl_int CL_API_CALL clGetKernelInfo(cl_kernel kernel,
             paramValue,
             paramValueSizeRet);
     }
-    TRACING_EXIT(clGetKernelInfo, &retVal);
+    TRACING_EXIT(ClGetKernelInfo, &retVal);
     return retVal;
 }
 
@@ -1939,7 +1939,7 @@ cl_int CL_API_CALL clGetKernelArgInfo(cl_kernel kernel,
                                       size_t paramValueSize,
                                       void *paramValue,
                                       size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetKernelArgInfo, &kernel, &argIndx, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetKernelArgInfo, &kernel, &argIndx, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
 
@@ -1959,7 +1959,7 @@ cl_int CL_API_CALL clGetKernelArgInfo(cl_kernel kernel,
                        paramValue,
                        paramValueSizeRet)
                  : CL_INVALID_KERNEL;
-    TRACING_EXIT(clGetKernelArgInfo, &retVal);
+    TRACING_EXIT(ClGetKernelArgInfo, &retVal);
     return retVal;
 }
 
@@ -1969,7 +1969,7 @@ cl_int CL_API_CALL clGetKernelWorkGroupInfo(cl_kernel kernel,
                                             size_t paramValueSize,
                                             void *paramValue,
                                             size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetKernelWorkGroupInfo, &kernel, &device, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetKernelWorkGroupInfo, &kernel, &device, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
 
@@ -1999,13 +1999,13 @@ cl_int CL_API_CALL clGetKernelWorkGroupInfo(cl_kernel kernel,
             paramValue,
             paramValueSizeRet);
     }
-    TRACING_EXIT(clGetKernelWorkGroupInfo, &retVal);
+    TRACING_EXIT(ClGetKernelWorkGroupInfo, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clWaitForEvents(cl_uint numEvents,
                                    const cl_event *eventList) {
-    TRACING_ENTER(clWaitForEvents, &numEvents, &eventList);
+    TRACING_ENTER(ClWaitForEvents, &numEvents, &eventList);
 
     auto retVal = CL_SUCCESS;
     API_ENTER(&retVal);
@@ -2015,12 +2015,12 @@ cl_int CL_API_CALL clWaitForEvents(cl_uint numEvents,
         retVal = validateObjects(eventList[i]);
 
     if (retVal != CL_SUCCESS) {
-        TRACING_EXIT(clWaitForEvents, &retVal);
+        TRACING_EXIT(ClWaitForEvents, &retVal);
         return retVal;
     }
 
     retVal = Event::waitForEvents(numEvents, eventList);
-    TRACING_EXIT(clWaitForEvents, &retVal);
+    TRACING_EXIT(ClWaitForEvents, &retVal);
     return retVal;
 }
 
@@ -2029,7 +2029,7 @@ cl_int CL_API_CALL clGetEventInfo(cl_event event,
                                   size_t paramValueSize,
                                   void *paramValue,
                                   size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetEventInfo, &event, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetEventInfo, &event, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     auto retVal = CL_SUCCESS;
     API_ENTER(&retVal);
 
@@ -2042,7 +2042,7 @@ cl_int CL_API_CALL clGetEventInfo(cl_event event,
     Event *neoEvent = castToObject<Event>(event);
     if (neoEvent == nullptr) {
         retVal = CL_INVALID_EVENT;
-        TRACING_EXIT(clGetEventInfo, &retVal);
+        TRACING_EXIT(ClGetEventInfo, &retVal);
         return retVal;
     }
 
@@ -2052,7 +2052,7 @@ cl_int CL_API_CALL clGetEventInfo(cl_event event,
     switch (paramName) {
     default: {
         retVal = CL_INVALID_VALUE;
-        TRACING_EXIT(clGetEventInfo, &retVal);
+        TRACING_EXIT(ClGetEventInfo, &retVal);
         return retVal;
     }
     // From OCL spec :
@@ -2061,20 +2061,20 @@ cl_int CL_API_CALL clGetEventInfo(cl_event event,
     case CL_EVENT_COMMAND_QUEUE: {
         if (neoEvent->isUserEvent()) {
             retVal = changeGetInfoStatusToCLResultType(info.set<cl_command_queue>(nullptr));
-            TRACING_EXIT(clGetEventInfo, &retVal);
+            TRACING_EXIT(ClGetEventInfo, &retVal);
             return retVal;
         }
         retVal = changeGetInfoStatusToCLResultType(info.set<cl_command_queue>(neoEvent->getCommandQueue()));
-        TRACING_EXIT(clGetEventInfo, &retVal);
+        TRACING_EXIT(ClGetEventInfo, &retVal);
         return retVal;
     }
     case CL_EVENT_CONTEXT:
         retVal = changeGetInfoStatusToCLResultType(info.set<cl_context>(neoEvent->getContext()));
-        TRACING_EXIT(clGetEventInfo, &retVal);
+        TRACING_EXIT(ClGetEventInfo, &retVal);
         return retVal;
     case CL_EVENT_COMMAND_TYPE:
         retVal = changeGetInfoStatusToCLResultType(info.set<cl_command_type>(neoEvent->getCommandType()));
-        TRACING_EXIT(clGetEventInfo, &retVal);
+        TRACING_EXIT(ClGetEventInfo, &retVal);
         return retVal;
     case CL_EVENT_COMMAND_EXECUTION_STATUS:
         if (DebugManager.flags.SkipFlushingEventsOnGetStatusCalls.get()) {
@@ -2094,23 +2094,23 @@ cl_int CL_API_CALL clGetEventInfo(cl_event event,
                 executionStatus = CL_SUBMITTED;
             }
             retVal = changeGetInfoStatusToCLResultType(info.set<cl_int>(executionStatus));
-            TRACING_EXIT(clGetEventInfo, &retVal);
+            TRACING_EXIT(ClGetEventInfo, &retVal);
             return retVal;
         }
 
         retVal = changeGetInfoStatusToCLResultType(info.set<cl_int>(neoEvent->updateEventAndReturnCurrentStatus()));
-        TRACING_EXIT(clGetEventInfo, &retVal);
+        TRACING_EXIT(ClGetEventInfo, &retVal);
         return retVal;
     case CL_EVENT_REFERENCE_COUNT:
         retVal = changeGetInfoStatusToCLResultType(info.set<cl_uint>(neoEvent->getReference()));
-        TRACING_EXIT(clGetEventInfo, &retVal);
+        TRACING_EXIT(ClGetEventInfo, &retVal);
         return retVal;
     }
 }
 
 cl_event CL_API_CALL clCreateUserEvent(cl_context context,
                                        cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateUserEvent, &context, &errcodeRet);
+    TRACING_ENTER(ClCreateUserEvent, &context, &errcodeRet);
     API_ENTER(errcodeRet);
 
     DBG_LOG_INPUTS("context", context);
@@ -2121,7 +2121,7 @@ cl_event CL_API_CALL clCreateUserEvent(cl_context context,
     if (ctx == nullptr) {
         err.set(CL_INVALID_CONTEXT);
         cl_event retVal = nullptr;
-        TRACING_EXIT(clCreateUserEvent, &retVal);
+        TRACING_EXIT(ClCreateUserEvent, &retVal);
         return retVal;
     }
 
@@ -2129,12 +2129,12 @@ cl_event CL_API_CALL clCreateUserEvent(cl_context context,
     cl_event userClEvent = userEvent;
     DBG_LOG_INPUTS("cl_event", userClEvent, "UserEvent", userEvent);
 
-    TRACING_EXIT(clCreateUserEvent, &userClEvent);
+    TRACING_EXIT(ClCreateUserEvent, &userClEvent);
     return userClEvent;
 }
 
 cl_int CL_API_CALL clRetainEvent(cl_event event) {
-    TRACING_ENTER(clRetainEvent, &event);
+    TRACING_ENTER(ClRetainEvent, &event);
     auto retVal = CL_SUCCESS;
     API_ENTER(&retVal);
 
@@ -2143,16 +2143,16 @@ cl_int CL_API_CALL clRetainEvent(cl_event event) {
 
     if (pEvent) {
         pEvent->retain();
-        TRACING_EXIT(clRetainEvent, &retVal);
+        TRACING_EXIT(ClRetainEvent, &retVal);
         return retVal;
     }
     retVal = CL_INVALID_EVENT;
-    TRACING_EXIT(clRetainEvent, &retVal);
+    TRACING_EXIT(ClRetainEvent, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clReleaseEvent(cl_event event) {
-    TRACING_ENTER(clReleaseEvent, &event);
+    TRACING_ENTER(ClReleaseEvent, &event);
     auto retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     auto pEvent = castToObject<Event>(event);
@@ -2160,17 +2160,17 @@ cl_int CL_API_CALL clReleaseEvent(cl_event event) {
 
     if (pEvent) {
         pEvent->release();
-        TRACING_EXIT(clReleaseEvent, &retVal);
+        TRACING_EXIT(ClReleaseEvent, &retVal);
         return retVal;
     }
     retVal = CL_INVALID_EVENT;
-    TRACING_EXIT(clReleaseEvent, &retVal);
+    TRACING_EXIT(ClReleaseEvent, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clSetUserEventStatus(cl_event event,
                                         cl_int executionStatus) {
-    TRACING_ENTER(clSetUserEventStatus, &event, &executionStatus);
+    TRACING_ENTER(ClSetUserEventStatus, &event, &executionStatus);
     auto retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     auto userEvent = castToObject<UserEvent>(event);
@@ -2178,24 +2178,24 @@ cl_int CL_API_CALL clSetUserEventStatus(cl_event event,
 
     if (userEvent == nullptr) {
         retVal = CL_INVALID_EVENT;
-        TRACING_EXIT(clSetUserEventStatus, &retVal);
+        TRACING_EXIT(ClSetUserEventStatus, &retVal);
         return retVal;
     }
 
     if (executionStatus > CL_COMPLETE) {
         retVal = CL_INVALID_VALUE;
-        TRACING_EXIT(clSetUserEventStatus, &retVal);
+        TRACING_EXIT(ClSetUserEventStatus, &retVal);
         return retVal;
     }
 
     if (!userEvent->isInitialEventStatus()) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clSetUserEventStatus, &retVal);
+        TRACING_EXIT(ClSetUserEventStatus, &retVal);
         return retVal;
     }
 
     userEvent->setStatus(executionStatus);
-    TRACING_EXIT(clSetUserEventStatus, &retVal);
+    TRACING_EXIT(ClSetUserEventStatus, &retVal);
     return retVal;
 }
 
@@ -2203,7 +2203,7 @@ cl_int CL_API_CALL clSetEventCallback(cl_event event,
                                       cl_int commandExecCallbackType,
                                       void(CL_CALLBACK *funcNotify)(cl_event, cl_int, void *),
                                       void *userData) {
-    TRACING_ENTER(clSetEventCallback, &event, &commandExecCallbackType, &funcNotify, &userData);
+    TRACING_ENTER(ClSetEventCallback, &event, &commandExecCallbackType, &funcNotify, &userData);
     auto retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     auto eventObject = castToObject<Event>(event);
@@ -2211,7 +2211,7 @@ cl_int CL_API_CALL clSetEventCallback(cl_event event,
 
     if (eventObject == nullptr) {
         retVal = CL_INVALID_EVENT;
-        TRACING_EXIT(clSetEventCallback, &retVal);
+        TRACING_EXIT(ClSetEventCallback, &retVal);
         return retVal;
     }
     switch (commandExecCallbackType) {
@@ -2221,19 +2221,19 @@ cl_int CL_API_CALL clSetEventCallback(cl_event event,
         break;
     default: {
         retVal = CL_INVALID_VALUE;
-        TRACING_EXIT(clSetEventCallback, &retVal);
+        TRACING_EXIT(ClSetEventCallback, &retVal);
         return retVal;
     }
     }
     if (funcNotify == nullptr) {
         retVal = CL_INVALID_VALUE;
-        TRACING_EXIT(clSetEventCallback, &retVal);
+        TRACING_EXIT(ClSetEventCallback, &retVal);
         return retVal;
     }
 
     eventObject->tryFlushEvent();
     eventObject->addCallback(funcNotify, commandExecCallbackType, userData);
-    TRACING_EXIT(clSetEventCallback, &retVal);
+    TRACING_EXIT(ClSetEventCallback, &retVal);
     return retVal;
 }
 
@@ -2242,7 +2242,7 @@ cl_int CL_API_CALL clGetEventProfilingInfo(cl_event event,
                                            size_t paramValueSize,
                                            void *paramValue,
                                            size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetEventProfilingInfo, &event, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetEventProfilingInfo, &event, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     auto retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("event", event,
@@ -2254,7 +2254,7 @@ cl_int CL_API_CALL clGetEventProfilingInfo(cl_event event,
 
     if (eventObject == nullptr) {
         retVal = CL_INVALID_EVENT;
-        TRACING_EXIT(clGetEventProfilingInfo, &retVal);
+        TRACING_EXIT(ClGetEventProfilingInfo, &retVal);
         return retVal;
     }
 
@@ -2262,12 +2262,12 @@ cl_int CL_API_CALL clGetEventProfilingInfo(cl_event event,
                                                 paramValueSize,
                                                 paramValue,
                                                 paramValueSizeRet);
-    TRACING_EXIT(clGetEventProfilingInfo, &retVal);
+    TRACING_EXIT(ClGetEventProfilingInfo, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clFlush(cl_command_queue commandQueue) {
-    TRACING_ENTER(clFlush, &commandQueue);
+    TRACING_ENTER(ClFlush, &commandQueue);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue);
@@ -2276,12 +2276,12 @@ cl_int CL_API_CALL clFlush(cl_command_queue commandQueue) {
     retVal = pCommandQueue
                  ? pCommandQueue->flush()
                  : CL_INVALID_COMMAND_QUEUE;
-    TRACING_EXIT(clFlush, &retVal);
+    TRACING_EXIT(ClFlush, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clFinish(cl_command_queue commandQueue) {
-    TRACING_ENTER(clFinish, &commandQueue);
+    TRACING_ENTER(ClFinish, &commandQueue);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue);
@@ -2290,7 +2290,7 @@ cl_int CL_API_CALL clFinish(cl_command_queue commandQueue) {
     retVal = pCommandQueue
                  ? pCommandQueue->finish()
                  : CL_INVALID_COMMAND_QUEUE;
-    TRACING_EXIT(clFinish, &retVal);
+    TRACING_EXIT(ClFinish, &retVal);
     return retVal;
 }
 
@@ -2303,7 +2303,7 @@ cl_int CL_API_CALL clEnqueueReadBuffer(cl_command_queue commandQueue,
                                        cl_uint numEventsInWaitList,
                                        const cl_event *eventWaitList,
                                        cl_event *event) {
-    TRACING_ENTER(clEnqueueReadBuffer, &commandQueue, &buffer, &blockingRead, &offset, &cb, &ptr, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueReadBuffer, &commandQueue, &buffer, &blockingRead, &offset, &cb, &ptr, &numEventsInWaitList, &eventWaitList, &event);
     CommandQueue *pCommandQueue = nullptr;
     Buffer *pBuffer = nullptr;
 
@@ -2324,13 +2324,13 @@ cl_int CL_API_CALL clEnqueueReadBuffer(cl_command_queue commandQueue,
 
         if (pBuffer->readMemObjFlagsInvalid()) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueReadBuffer, &retVal);
+            TRACING_EXIT(ClEnqueueReadBuffer, &retVal);
             return retVal;
         }
 
         if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_TRANSFER_BUFFER_INTEL, numEventsInWaitList, eventWaitList, event)) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueReadBuffer, &retVal);
+            TRACING_EXIT(ClEnqueueReadBuffer, &retVal);
             return retVal;
         }
 
@@ -2347,7 +2347,7 @@ cl_int CL_API_CALL clEnqueueReadBuffer(cl_command_queue commandQueue,
     }
 
     DBG_LOG_INPUTS("event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
-    TRACING_EXIT(clEnqueueReadBuffer, &retVal);
+    TRACING_EXIT(ClEnqueueReadBuffer, &retVal);
     return retVal;
 }
 
@@ -2365,7 +2365,7 @@ cl_int CL_API_CALL clEnqueueReadBufferRect(cl_command_queue commandQueue,
                                            cl_uint numEventsInWaitList,
                                            const cl_event *eventWaitList,
                                            cl_event *event) {
-    TRACING_ENTER(clEnqueueReadBufferRect, &commandQueue, &buffer, &blockingRead, &bufferOrigin, &hostOrigin, &region, &bufferRowPitch, &bufferSlicePitch, &hostRowPitch, &hostSlicePitch, &ptr, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueReadBufferRect, &commandQueue, &buffer, &blockingRead, &bufferOrigin, &hostOrigin, &region, &bufferRowPitch, &bufferSlicePitch, &hostRowPitch, &hostSlicePitch, &ptr, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue,
@@ -2398,13 +2398,13 @@ cl_int CL_API_CALL clEnqueueReadBufferRect(cl_command_queue commandQueue,
         ptr);
 
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clEnqueueReadBufferRect, &retVal);
+        TRACING_EXIT(ClEnqueueReadBufferRect, &retVal);
         return retVal;
     }
 
     if (pBuffer->readMemObjFlagsInvalid()) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueReadBufferRect, &retVal);
+        TRACING_EXIT(ClEnqueueReadBufferRect, &retVal);
         return retVal;
     }
 
@@ -2416,13 +2416,13 @@ cl_int CL_API_CALL clEnqueueReadBufferRect(cl_command_queue commandQueue,
                                     hostSlicePitch,
                                     true) == false) {
         retVal = CL_INVALID_VALUE;
-        TRACING_EXIT(clEnqueueReadBufferRect, &retVal);
+        TRACING_EXIT(ClEnqueueReadBufferRect, &retVal);
         return retVal;
     }
 
     if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_TRANSFER_BUFFER_RECT_INTEL, numEventsInWaitList, eventWaitList, event)) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueReadBufferRect, &retVal);
+        TRACING_EXIT(ClEnqueueReadBufferRect, &retVal);
         return retVal;
     }
 
@@ -2440,7 +2440,7 @@ cl_int CL_API_CALL clEnqueueReadBufferRect(cl_command_queue commandQueue,
         numEventsInWaitList,
         eventWaitList,
         event);
-    TRACING_EXIT(clEnqueueReadBufferRect, &retVal);
+    TRACING_EXIT(ClEnqueueReadBufferRect, &retVal);
     return retVal;
 }
 
@@ -2453,7 +2453,7 @@ cl_int CL_API_CALL clEnqueueWriteBuffer(cl_command_queue commandQueue,
                                         cl_uint numEventsInWaitList,
                                         const cl_event *eventWaitList,
                                         cl_event *event) {
-    TRACING_ENTER(clEnqueueWriteBuffer, &commandQueue, &buffer, &blockingWrite, &offset, &cb, &ptr, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueWriteBuffer, &commandQueue, &buffer, &blockingWrite, &offset, &cb, &ptr, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
 
@@ -2475,13 +2475,13 @@ cl_int CL_API_CALL clEnqueueWriteBuffer(cl_command_queue commandQueue,
 
         if (pBuffer->writeMemObjFlagsInvalid()) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueWriteBuffer, &retVal);
+            TRACING_EXIT(ClEnqueueWriteBuffer, &retVal);
             return retVal;
         }
 
         if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_TRANSFER_BUFFER_INTEL, numEventsInWaitList, eventWaitList, event)) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueWriteBuffer, &retVal);
+            TRACING_EXIT(ClEnqueueWriteBuffer, &retVal);
             return retVal;
         }
 
@@ -2498,7 +2498,7 @@ cl_int CL_API_CALL clEnqueueWriteBuffer(cl_command_queue commandQueue,
     }
 
     DBG_LOG_INPUTS("event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
-    TRACING_EXIT(clEnqueueWriteBuffer, &retVal);
+    TRACING_EXIT(ClEnqueueWriteBuffer, &retVal);
     return retVal;
 }
 
@@ -2516,7 +2516,7 @@ cl_int CL_API_CALL clEnqueueWriteBufferRect(cl_command_queue commandQueue,
                                             cl_uint numEventsInWaitList,
                                             const cl_event *eventWaitList,
                                             cl_event *event) {
-    TRACING_ENTER(clEnqueueWriteBufferRect, &commandQueue, &buffer, &blockingWrite, &bufferOrigin, &hostOrigin, &region, &bufferRowPitch, &bufferSlicePitch, &hostRowPitch, &hostSlicePitch, &ptr, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueWriteBufferRect, &commandQueue, &buffer, &blockingWrite, &bufferOrigin, &hostOrigin, &region, &bufferRowPitch, &bufferSlicePitch, &hostRowPitch, &hostSlicePitch, &ptr, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
 
@@ -2539,13 +2539,13 @@ cl_int CL_API_CALL clEnqueueWriteBufferRect(cl_command_queue commandQueue,
         ptr);
 
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clEnqueueWriteBufferRect, &retVal);
+        TRACING_EXIT(ClEnqueueWriteBufferRect, &retVal);
         return retVal;
     }
 
     if (pBuffer->writeMemObjFlagsInvalid()) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueWriteBufferRect, &retVal);
+        TRACING_EXIT(ClEnqueueWriteBufferRect, &retVal);
         return retVal;
     }
 
@@ -2557,13 +2557,13 @@ cl_int CL_API_CALL clEnqueueWriteBufferRect(cl_command_queue commandQueue,
                                     hostSlicePitch,
                                     true) == false) {
         retVal = CL_INVALID_VALUE;
-        TRACING_EXIT(clEnqueueWriteBufferRect, &retVal);
+        TRACING_EXIT(ClEnqueueWriteBufferRect, &retVal);
         return retVal;
     }
 
     if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_TRANSFER_BUFFER_RECT_INTEL, numEventsInWaitList, eventWaitList, event)) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueWriteBufferRect, &retVal);
+        TRACING_EXIT(ClEnqueueWriteBufferRect, &retVal);
         return retVal;
     }
 
@@ -2582,7 +2582,7 @@ cl_int CL_API_CALL clEnqueueWriteBufferRect(cl_command_queue commandQueue,
         eventWaitList,
         event);
 
-    TRACING_EXIT(clEnqueueWriteBufferRect, &retVal);
+    TRACING_EXIT(ClEnqueueWriteBufferRect, &retVal);
     return retVal;
 }
 
@@ -2595,7 +2595,7 @@ cl_int CL_API_CALL clEnqueueFillBuffer(cl_command_queue commandQueue,
                                        cl_uint numEventsInWaitList,
                                        const cl_event *eventWaitList,
                                        cl_event *event) {
-    TRACING_ENTER(clEnqueueFillBuffer, &commandQueue, &buffer, &pattern, &patternSize, &offset, &size, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueFillBuffer, &commandQueue, &buffer, &pattern, &patternSize, &offset, &size, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
 
@@ -2619,7 +2619,7 @@ cl_int CL_API_CALL clEnqueueFillBuffer(cl_command_queue commandQueue,
     if (CL_SUCCESS == retVal) {
         if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_FILL_BUFFER_INTEL, numEventsInWaitList, eventWaitList, event)) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueFillBuffer, &retVal);
+            TRACING_EXIT(ClEnqueueFillBuffer, &retVal);
             return retVal;
         }
 
@@ -2633,7 +2633,7 @@ cl_int CL_API_CALL clEnqueueFillBuffer(cl_command_queue commandQueue,
             eventWaitList,
             event);
     }
-    TRACING_EXIT(clEnqueueFillBuffer, &retVal);
+    TRACING_EXIT(ClEnqueueFillBuffer, &retVal);
     return retVal;
 }
 
@@ -2646,7 +2646,7 @@ cl_int CL_API_CALL clEnqueueCopyBuffer(cl_command_queue commandQueue,
                                        cl_uint numEventsInWaitList,
                                        const cl_event *eventWaitList,
                                        cl_event *event) {
-    TRACING_ENTER(clEnqueueCopyBuffer, &commandQueue, &srcBuffer, &dstBuffer, &srcOffset, &dstOffset, &cb, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueCopyBuffer, &commandQueue, &srcBuffer, &dstBuffer, &srcOffset, &dstOffset, &cb, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
 
@@ -2670,13 +2670,13 @@ cl_int CL_API_CALL clEnqueueCopyBuffer(cl_command_queue commandQueue,
         size_t dstSize = pDstBuffer->getSize();
         if (srcOffset + cb > srcSize || dstOffset + cb > dstSize) {
             retVal = CL_INVALID_VALUE;
-            TRACING_EXIT(clEnqueueCopyBuffer, &retVal);
+            TRACING_EXIT(ClEnqueueCopyBuffer, &retVal);
             return retVal;
         }
 
         if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_TRANSFER_BUFFER_INTEL, numEventsInWaitList, eventWaitList, event)) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueCopyBuffer, &retVal);
+            TRACING_EXIT(ClEnqueueCopyBuffer, &retVal);
             return retVal;
         }
 
@@ -2691,7 +2691,7 @@ cl_int CL_API_CALL clEnqueueCopyBuffer(cl_command_queue commandQueue,
             event);
     }
     DBG_LOG_INPUTS("event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
-    TRACING_EXIT(clEnqueueCopyBuffer, &retVal);
+    TRACING_EXIT(ClEnqueueCopyBuffer, &retVal);
     return retVal;
 }
 
@@ -2708,7 +2708,7 @@ cl_int CL_API_CALL clEnqueueCopyBufferRect(cl_command_queue commandQueue,
                                            cl_uint numEventsInWaitList,
                                            const cl_event *eventWaitList,
                                            cl_event *event) {
-    TRACING_ENTER(clEnqueueCopyBufferRect, &commandQueue, &srcBuffer, &dstBuffer, &srcOrigin, &dstOrigin, &region, &srcRowPitch, &srcSlicePitch, &dstRowPitch, &dstSlicePitch, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueCopyBufferRect, &commandQueue, &srcBuffer, &dstBuffer, &srcOrigin, &dstOrigin, &region, &srcRowPitch, &srcSlicePitch, &dstRowPitch, &dstSlicePitch, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
 
@@ -2748,12 +2748,12 @@ cl_int CL_API_CALL clEnqueueCopyBufferRect(cl_command_queue commandQueue,
                                             dstSlicePitch,
                                             false)) {
             retVal = CL_INVALID_VALUE;
-            TRACING_EXIT(clEnqueueCopyBufferRect, &retVal);
+            TRACING_EXIT(ClEnqueueCopyBufferRect, &retVal);
             return retVal;
         }
         if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_TRANSFER_BUFFER_RECT_INTEL, numEventsInWaitList, eventWaitList, event)) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueCopyBufferRect, &retVal);
+            TRACING_EXIT(ClEnqueueCopyBufferRect, &retVal);
             return retVal;
         }
 
@@ -2772,7 +2772,7 @@ cl_int CL_API_CALL clEnqueueCopyBufferRect(cl_command_queue commandQueue,
             event);
     }
     DBG_LOG_INPUTS("event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
-    TRACING_EXIT(clEnqueueCopyBufferRect, &retVal);
+    TRACING_EXIT(ClEnqueueCopyBufferRect, &retVal);
     return retVal;
 }
 
@@ -2787,7 +2787,7 @@ cl_int CL_API_CALL clEnqueueReadImage(cl_command_queue commandQueue,
                                       cl_uint numEventsInWaitList,
                                       const cl_event *eventWaitList,
                                       cl_event *event) {
-    TRACING_ENTER(clEnqueueReadImage, &commandQueue, &image, &blockingRead, &origin, &region, &rowPitch, &slicePitch, &ptr, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueReadImage, &commandQueue, &image, &blockingRead, &origin, &region, &rowPitch, &slicePitch, &ptr, &numEventsInWaitList, &eventWaitList, &event);
 
     CommandQueue *pCommandQueue = nullptr;
     Image *pImage = nullptr;
@@ -2810,25 +2810,25 @@ cl_int CL_API_CALL clEnqueueReadImage(cl_command_queue commandQueue,
 
         if (pImage->readMemObjFlagsInvalid()) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueReadImage, &retVal);
+            TRACING_EXIT(ClEnqueueReadImage, &retVal);
             return retVal;
         }
         if (isPackedYuvImage(&pImage->getImageFormat())) {
             retVal = validateYuvOperation(origin, region);
             if (retVal != CL_SUCCESS) {
-                TRACING_EXIT(clEnqueueReadImage, &retVal);
+                TRACING_EXIT(ClEnqueueReadImage, &retVal);
                 return retVal;
             }
         }
         retVal = Image::validateRegionAndOrigin(origin, region, pImage->getImageDesc());
         if (retVal != CL_SUCCESS) {
-            TRACING_EXIT(clEnqueueReadImage, &retVal);
+            TRACING_EXIT(ClEnqueueReadImage, &retVal);
             return retVal;
         }
 
         if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_TRANSFER_IMAGE_INTEL, numEventsInWaitList, eventWaitList, event)) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueReadImage, &retVal);
+            TRACING_EXIT(ClEnqueueReadImage, &retVal);
             return retVal;
         }
 
@@ -2846,7 +2846,7 @@ cl_int CL_API_CALL clEnqueueReadImage(cl_command_queue commandQueue,
             event);
     }
     DBG_LOG_INPUTS("event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
-    TRACING_EXIT(clEnqueueReadImage, &retVal);
+    TRACING_EXIT(ClEnqueueReadImage, &retVal);
     return retVal;
 }
 
@@ -2861,7 +2861,7 @@ cl_int CL_API_CALL clEnqueueWriteImage(cl_command_queue commandQueue,
                                        cl_uint numEventsInWaitList,
                                        const cl_event *eventWaitList,
                                        cl_event *event) {
-    TRACING_ENTER(clEnqueueWriteImage, &commandQueue, &image, &blockingWrite, &origin, &region, &inputRowPitch, &inputSlicePitch, &ptr, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueWriteImage, &commandQueue, &image, &blockingWrite, &origin, &region, &inputRowPitch, &inputSlicePitch, &ptr, &numEventsInWaitList, &eventWaitList, &event);
 
     CommandQueue *pCommandQueue = nullptr;
     Image *pImage = nullptr;
@@ -2883,25 +2883,25 @@ cl_int CL_API_CALL clEnqueueWriteImage(cl_command_queue commandQueue,
     if (CL_SUCCESS == retVal) {
         if (pImage->writeMemObjFlagsInvalid()) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueWriteImage, &retVal);
+            TRACING_EXIT(ClEnqueueWriteImage, &retVal);
             return retVal;
         }
         if (isPackedYuvImage(&pImage->getImageFormat())) {
             retVal = validateYuvOperation(origin, region);
             if (retVal != CL_SUCCESS) {
-                TRACING_EXIT(clEnqueueWriteImage, &retVal);
+                TRACING_EXIT(ClEnqueueWriteImage, &retVal);
                 return retVal;
             }
         }
         retVal = Image::validateRegionAndOrigin(origin, region, pImage->getImageDesc());
         if (retVal != CL_SUCCESS) {
-            TRACING_EXIT(clEnqueueWriteImage, &retVal);
+            TRACING_EXIT(ClEnqueueWriteImage, &retVal);
             return retVal;
         }
 
         if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_TRANSFER_IMAGE_INTEL, numEventsInWaitList, eventWaitList, event)) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueWriteImage, &retVal);
+            TRACING_EXIT(ClEnqueueWriteImage, &retVal);
             return retVal;
         }
 
@@ -2919,7 +2919,7 @@ cl_int CL_API_CALL clEnqueueWriteImage(cl_command_queue commandQueue,
             event);
     }
     DBG_LOG_INPUTS("event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
-    TRACING_EXIT(clEnqueueWriteImage, &retVal);
+    TRACING_EXIT(ClEnqueueWriteImage, &retVal);
     return retVal;
 }
 
@@ -2931,7 +2931,7 @@ cl_int CL_API_CALL clEnqueueFillImage(cl_command_queue commandQueue,
                                       cl_uint numEventsInWaitList,
                                       const cl_event *eventWaitList,
                                       cl_event *event) {
-    TRACING_ENTER(clEnqueueFillImage, &commandQueue, &image, &fillColor, &origin, &region, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueFillImage, &commandQueue, &image, &fillColor, &origin, &region, &numEventsInWaitList, &eventWaitList, &event);
 
     CommandQueue *pCommandQueue = nullptr;
     Image *dstImage = nullptr;
@@ -2954,13 +2954,13 @@ cl_int CL_API_CALL clEnqueueFillImage(cl_command_queue commandQueue,
     if (CL_SUCCESS == retVal) {
         retVal = Image::validateRegionAndOrigin(origin, region, dstImage->getImageDesc());
         if (retVal != CL_SUCCESS) {
-            TRACING_EXIT(clEnqueueFillImage, &retVal);
+            TRACING_EXIT(ClEnqueueFillImage, &retVal);
             return retVal;
         }
 
         if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_FILL_IMAGE_INTEL, numEventsInWaitList, eventWaitList, event)) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueFillImage, &retVal);
+            TRACING_EXIT(ClEnqueueFillImage, &retVal);
             return retVal;
         }
 
@@ -2974,7 +2974,7 @@ cl_int CL_API_CALL clEnqueueFillImage(cl_command_queue commandQueue,
             event);
     }
     DBG_LOG_INPUTS("event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
-    TRACING_EXIT(clEnqueueFillImage, &retVal);
+    TRACING_EXIT(ClEnqueueFillImage, &retVal);
     return retVal;
 }
 
@@ -2987,7 +2987,7 @@ cl_int CL_API_CALL clEnqueueCopyImage(cl_command_queue commandQueue,
                                       cl_uint numEventsInWaitList,
                                       const cl_event *eventWaitList,
                                       cl_event *event) {
-    TRACING_ENTER(clEnqueueCopyImage, &commandQueue, &srcImage, &dstImage, &srcOrigin, &dstOrigin, &region, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueCopyImage, &commandQueue, &srcImage, &dstImage, &srcOrigin, &dstOrigin, &region, &numEventsInWaitList, &eventWaitList, &event);
 
     CommandQueue *pCommandQueue = nullptr;
     Image *pSrcImage = nullptr;
@@ -3010,13 +3010,13 @@ cl_int CL_API_CALL clEnqueueCopyImage(cl_command_queue commandQueue,
     if (CL_SUCCESS == retVal) {
         if (memcmp(&pSrcImage->getImageFormat(), &pDstImage->getImageFormat(), sizeof(cl_image_format))) {
             retVal = CL_IMAGE_FORMAT_MISMATCH;
-            TRACING_EXIT(clEnqueueCopyImage, &retVal);
+            TRACING_EXIT(ClEnqueueCopyImage, &retVal);
             return retVal;
         }
         if (isPackedYuvImage(&pSrcImage->getImageFormat())) {
             retVal = validateYuvOperation(srcOrigin, region);
             if (retVal != CL_SUCCESS) {
-                TRACING_EXIT(clEnqueueCopyImage, &retVal);
+                TRACING_EXIT(ClEnqueueCopyImage, &retVal);
                 return retVal;
             }
         }
@@ -3024,29 +3024,29 @@ cl_int CL_API_CALL clEnqueueCopyImage(cl_command_queue commandQueue,
             retVal = validateYuvOperation(dstOrigin, region);
 
             if (retVal != CL_SUCCESS) {
-                TRACING_EXIT(clEnqueueCopyImage, &retVal);
+                TRACING_EXIT(ClEnqueueCopyImage, &retVal);
                 return retVal;
             }
             if (pDstImage->getImageDesc().image_type == CL_MEM_OBJECT_IMAGE2D && dstOrigin[2] != 0) {
                 retVal = CL_INVALID_VALUE;
-                TRACING_EXIT(clEnqueueCopyImage, &retVal);
+                TRACING_EXIT(ClEnqueueCopyImage, &retVal);
                 return retVal;
             }
         }
         retVal = Image::validateRegionAndOrigin(srcOrigin, region, pSrcImage->getImageDesc());
         if (retVal != CL_SUCCESS) {
-            TRACING_EXIT(clEnqueueCopyImage, &retVal);
+            TRACING_EXIT(ClEnqueueCopyImage, &retVal);
             return retVal;
         }
         retVal = Image::validateRegionAndOrigin(dstOrigin, region, pDstImage->getImageDesc());
         if (retVal != CL_SUCCESS) {
-            TRACING_EXIT(clEnqueueCopyImage, &retVal);
+            TRACING_EXIT(ClEnqueueCopyImage, &retVal);
             return retVal;
         }
 
         if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_TRANSFER_IMAGE_INTEL, numEventsInWaitList, eventWaitList, event)) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueCopyImage, &retVal);
+            TRACING_EXIT(ClEnqueueCopyImage, &retVal);
             return retVal;
         }
 
@@ -3061,7 +3061,7 @@ cl_int CL_API_CALL clEnqueueCopyImage(cl_command_queue commandQueue,
             event);
     }
     DBG_LOG_INPUTS("event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
-    TRACING_EXIT(clEnqueueCopyImage, &retVal);
+    TRACING_EXIT(ClEnqueueCopyImage, &retVal);
     return retVal;
 }
 
@@ -3074,7 +3074,7 @@ cl_int CL_API_CALL clEnqueueCopyImageToBuffer(cl_command_queue commandQueue,
                                               cl_uint numEventsInWaitList,
                                               const cl_event *eventWaitList,
                                               cl_event *event) {
-    TRACING_ENTER(clEnqueueCopyImageToBuffer, &commandQueue, &srcImage, &dstBuffer, &srcOrigin, &region, (size_t *)&dstOffset, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueCopyImageToBuffer, &commandQueue, &srcImage, &dstBuffer, &srcOrigin, &region, (size_t *)&dstOffset, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
 
@@ -3099,19 +3099,19 @@ cl_int CL_API_CALL clEnqueueCopyImageToBuffer(cl_command_queue commandQueue,
         if (isPackedYuvImage(&pSrcImage->getImageFormat())) {
             retVal = validateYuvOperation(srcOrigin, region);
             if (retVal != CL_SUCCESS) {
-                TRACING_EXIT(clEnqueueCopyImageToBuffer, &retVal);
+                TRACING_EXIT(ClEnqueueCopyImageToBuffer, &retVal);
                 return retVal;
             }
         }
         retVal = Image::validateRegionAndOrigin(srcOrigin, region, pSrcImage->getImageDesc());
         if (retVal != CL_SUCCESS) {
-            TRACING_EXIT(clEnqueueCopyImageToBuffer, &retVal);
+            TRACING_EXIT(ClEnqueueCopyImageToBuffer, &retVal);
             return retVal;
         }
 
         if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_TRANSFER_IMAGE_BUFFER_INTEL, numEventsInWaitList, eventWaitList, event)) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueCopyImageToBuffer, &retVal);
+            TRACING_EXIT(ClEnqueueCopyImageToBuffer, &retVal);
             return retVal;
         }
 
@@ -3127,7 +3127,7 @@ cl_int CL_API_CALL clEnqueueCopyImageToBuffer(cl_command_queue commandQueue,
     }
 
     DBG_LOG_INPUTS("event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
-    TRACING_EXIT(clEnqueueCopyImageToBuffer, &retVal);
+    TRACING_EXIT(ClEnqueueCopyImageToBuffer, &retVal);
     return retVal;
 }
 
@@ -3140,7 +3140,7 @@ cl_int CL_API_CALL clEnqueueCopyBufferToImage(cl_command_queue commandQueue,
                                               cl_uint numEventsInWaitList,
                                               const cl_event *eventWaitList,
                                               cl_event *event) {
-    TRACING_ENTER(clEnqueueCopyBufferToImage, &commandQueue, &srcBuffer, &dstImage, &srcOffset, &dstOrigin, &region, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueCopyBufferToImage, &commandQueue, &srcBuffer, &dstImage, &srcOffset, &dstOrigin, &region, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
 
@@ -3164,19 +3164,19 @@ cl_int CL_API_CALL clEnqueueCopyBufferToImage(cl_command_queue commandQueue,
         if (isPackedYuvImage(&pDstImage->getImageFormat())) {
             retVal = validateYuvOperation(dstOrigin, region);
             if (retVal != CL_SUCCESS) {
-                TRACING_EXIT(clEnqueueCopyBufferToImage, &retVal);
+                TRACING_EXIT(ClEnqueueCopyBufferToImage, &retVal);
                 return retVal;
             }
         }
         retVal = Image::validateRegionAndOrigin(dstOrigin, region, pDstImage->getImageDesc());
         if (retVal != CL_SUCCESS) {
-            TRACING_EXIT(clEnqueueCopyBufferToImage, &retVal);
+            TRACING_EXIT(ClEnqueueCopyBufferToImage, &retVal);
             return retVal;
         }
 
         if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_TRANSFER_BUFFER_IMAGE_INTEL, numEventsInWaitList, eventWaitList, event)) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueCopyBufferToImage, &retVal);
+            TRACING_EXIT(ClEnqueueCopyBufferToImage, &retVal);
             return retVal;
         }
 
@@ -3192,7 +3192,7 @@ cl_int CL_API_CALL clEnqueueCopyBufferToImage(cl_command_queue commandQueue,
     }
 
     DBG_LOG_INPUTS("event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
-    TRACING_EXIT(clEnqueueCopyBufferToImage, &retVal);
+    TRACING_EXIT(ClEnqueueCopyBufferToImage, &retVal);
     return retVal;
 }
 
@@ -3206,7 +3206,7 @@ void *CL_API_CALL clEnqueueMapBuffer(cl_command_queue commandQueue,
                                      const cl_event *eventWaitList,
                                      cl_event *event,
                                      cl_int *errcodeRet) {
-    TRACING_ENTER(clEnqueueMapBuffer, &commandQueue, &buffer, &blockingMap, &mapFlags, &offset, &cb, &numEventsInWaitList, &eventWaitList, &event, &errcodeRet);
+    TRACING_ENTER(ClEnqueueMapBuffer, &commandQueue, &buffer, &blockingMap, &mapFlags, &offset, &cb, &numEventsInWaitList, &eventWaitList, &event, &errcodeRet);
     void *retPtr = nullptr;
     ErrorCodeHelper err(errcodeRet, CL_SUCCESS);
     cl_int retVal;
@@ -3256,7 +3256,7 @@ void *CL_API_CALL clEnqueueMapBuffer(cl_command_queue commandQueue,
     err.set(retVal);
     DBG_LOG_INPUTS("retPtr", retPtr, "event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
 
-    TRACING_EXIT(clEnqueueMapBuffer, &retPtr);
+    TRACING_EXIT(ClEnqueueMapBuffer, &retPtr);
     return retPtr;
 }
 
@@ -3272,7 +3272,7 @@ void *CL_API_CALL clEnqueueMapImage(cl_command_queue commandQueue,
                                     const cl_event *eventWaitList,
                                     cl_event *event,
                                     cl_int *errcodeRet) {
-    TRACING_ENTER(clEnqueueMapImage, &commandQueue, &image, &blockingMap, &mapFlags, &origin, &region, &imageRowPitch, &imageSlicePitch, &numEventsInWaitList, &eventWaitList, &event, &errcodeRet);
+    TRACING_ENTER(ClEnqueueMapImage, &commandQueue, &image, &blockingMap, &mapFlags, &origin, &region, &imageRowPitch, &imageSlicePitch, &numEventsInWaitList, &eventWaitList, &event, &errcodeRet);
 
     void *retPtr = nullptr;
     ErrorCodeHelper err(errcodeRet, CL_SUCCESS);
@@ -3341,7 +3341,7 @@ void *CL_API_CALL clEnqueueMapImage(cl_command_queue commandQueue,
     err.set(retVal);
     DBG_LOG_INPUTS("retPtr", retPtr, "event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
 
-    TRACING_EXIT(clEnqueueMapImage, &retPtr);
+    TRACING_EXIT(ClEnqueueMapImage, &retPtr);
     return retPtr;
 }
 
@@ -3351,7 +3351,7 @@ cl_int CL_API_CALL clEnqueueUnmapMemObject(cl_command_queue commandQueue,
                                            cl_uint numEventsInWaitList,
                                            const cl_event *eventWaitList,
                                            cl_event *event) {
-    TRACING_ENTER(clEnqueueUnmapMemObject, &commandQueue, &memObj, &mappedPtr, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueUnmapMemObject, &commandQueue, &memObj, &mappedPtr, &numEventsInWaitList, &eventWaitList, &event);
 
     CommandQueue *pCommandQueue = nullptr;
     MemObj *pMemObj = nullptr;
@@ -3385,13 +3385,13 @@ cl_int CL_API_CALL clEnqueueUnmapMemObject(cl_command_queue commandQueue,
             break;
         default:
             retVal = CL_INVALID_MEM_OBJECT;
-            TRACING_EXIT(clEnqueueUnmapMemObject, &retVal);
+            TRACING_EXIT(ClEnqueueUnmapMemObject, &retVal);
             return retVal;
         }
 
         if (!pCommandQueue->validateCapabilityForOperation(requiredCapability, numEventsInWaitList, eventWaitList, event)) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueUnmapMemObject, &retVal);
+            TRACING_EXIT(ClEnqueueUnmapMemObject, &retVal);
             return retVal;
         }
 
@@ -3399,7 +3399,7 @@ cl_int CL_API_CALL clEnqueueUnmapMemObject(cl_command_queue commandQueue,
     }
 
     DBG_LOG_INPUTS("event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
-    TRACING_EXIT(clEnqueueUnmapMemObject, &retVal);
+    TRACING_EXIT(ClEnqueueUnmapMemObject, &retVal);
     return retVal;
 }
 
@@ -3410,7 +3410,7 @@ cl_int CL_API_CALL clEnqueueMigrateMemObjects(cl_command_queue commandQueue,
                                               cl_uint numEventsInWaitList,
                                               const cl_event *eventWaitList,
                                               cl_event *event) {
-    TRACING_ENTER(clEnqueueMigrateMemObjects, &commandQueue, &numMemObjects, &memObjects, &flags, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueMigrateMemObjects, &commandQueue, &numMemObjects, &memObjects, &flags, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
 
@@ -3428,13 +3428,13 @@ cl_int CL_API_CALL clEnqueueMigrateMemObjects(cl_command_queue commandQueue,
         EventWaitList(numEventsInWaitList, eventWaitList));
 
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clEnqueueMigrateMemObjects, &retVal);
+        TRACING_EXIT(ClEnqueueMigrateMemObjects, &retVal);
         return retVal;
     }
 
     if (numMemObjects == 0 || memObjects == nullptr) {
         retVal = CL_INVALID_VALUE;
-        TRACING_EXIT(clEnqueueMigrateMemObjects, &retVal);
+        TRACING_EXIT(ClEnqueueMigrateMemObjects, &retVal);
         return retVal;
     }
 
@@ -3442,7 +3442,7 @@ cl_int CL_API_CALL clEnqueueMigrateMemObjects(cl_command_queue commandQueue,
         auto memObject = castToObject<MemObj>(memObjects[object]);
         if (!memObject) {
             retVal = CL_INVALID_MEM_OBJECT;
-            TRACING_EXIT(clEnqueueMigrateMemObjects, &retVal);
+            TRACING_EXIT(ClEnqueueMigrateMemObjects, &retVal);
             return retVal;
         }
     }
@@ -3451,7 +3451,7 @@ cl_int CL_API_CALL clEnqueueMigrateMemObjects(cl_command_queue commandQueue,
 
     if ((flags & (~allValidFlags)) != 0) {
         retVal = CL_INVALID_VALUE;
-        TRACING_EXIT(clEnqueueMigrateMemObjects, &retVal);
+        TRACING_EXIT(ClEnqueueMigrateMemObjects, &retVal);
         return retVal;
     }
 
@@ -3462,7 +3462,7 @@ cl_int CL_API_CALL clEnqueueMigrateMemObjects(cl_command_queue commandQueue,
                                                      eventWaitList,
                                                      event);
     DBG_LOG_INPUTS("event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
-    TRACING_EXIT(clEnqueueMigrateMemObjects, &retVal);
+    TRACING_EXIT(ClEnqueueMigrateMemObjects, &retVal);
     return retVal;
 }
 
@@ -3475,7 +3475,7 @@ cl_int CL_API_CALL clEnqueueNDRangeKernel(cl_command_queue commandQueue,
                                           cl_uint numEventsInWaitList,
                                           const cl_event *eventWaitList,
                                           cl_event *event) {
-    TRACING_ENTER(clEnqueueNDRangeKernel, &commandQueue, &kernel, &workDim, &globalWorkOffset, &globalWorkSize, &localWorkSize, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueNdRangeKernel, &commandQueue, &kernel, &workDim, &globalWorkOffset, &globalWorkSize, &localWorkSize, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue, "cl_kernel", kernel,
@@ -3497,7 +3497,7 @@ cl_int CL_API_CALL clEnqueueNDRangeKernel(cl_command_queue commandQueue,
         EventWaitList(numEventsInWaitList, eventWaitList));
 
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clEnqueueNDRangeKernel, &retVal);
+        TRACING_EXIT(ClEnqueueNdRangeKernel, &retVal);
         return retVal;
     }
 
@@ -3505,13 +3505,13 @@ cl_int CL_API_CALL clEnqueueNDRangeKernel(cl_command_queue commandQueue,
     if ((pKernel->getExecutionType() != KernelExecutionType::Default) ||
         pKernel->usesSyncBuffer()) {
         retVal = CL_INVALID_KERNEL;
-        TRACING_EXIT(clEnqueueNDRangeKernel, &retVal);
+        TRACING_EXIT(ClEnqueueNdRangeKernel, &retVal);
         return retVal;
     }
 
     if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_KERNEL_INTEL, numEventsInWaitList, eventWaitList, event)) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueNDRangeKernel, &retVal);
+        TRACING_EXIT(ClEnqueueNdRangeKernel, &retVal);
         return retVal;
     }
 
@@ -3531,7 +3531,7 @@ cl_int CL_API_CALL clEnqueueNDRangeKernel(cl_command_queue commandQueue,
         event);
 
     DBG_LOG_INPUTS("event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1u));
-    TRACING_EXIT(clEnqueueNDRangeKernel, &retVal);
+    TRACING_EXIT(ClEnqueueNdRangeKernel, &retVal);
     return retVal;
 }
 
@@ -3540,7 +3540,7 @@ cl_int CL_API_CALL clEnqueueTask(cl_command_queue commandQueue,
                                  cl_uint numEventsInWaitList,
                                  const cl_event *eventWaitList,
                                  cl_event *event) {
-    TRACING_ENTER(clEnqueueTask, &commandQueue, &kernel, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueTask, &commandQueue, &kernel, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue, "kernel", kernel,
@@ -3561,7 +3561,7 @@ cl_int CL_API_CALL clEnqueueTask(cl_command_queue commandQueue,
         numEventsInWaitList,
         eventWaitList,
         event));
-    TRACING_EXIT(clEnqueueTask, &retVal);
+    TRACING_EXIT(ClEnqueueTask, &retVal);
     return retVal;
 }
 
@@ -3575,7 +3575,7 @@ cl_int CL_API_CALL clEnqueueNativeKernel(cl_command_queue commandQueue,
                                          cl_uint numEventsInWaitList,
                                          const cl_event *eventWaitList,
                                          cl_event *event) {
-    TRACING_ENTER(clEnqueueNativeKernel, &commandQueue, &userFunc, &args, &cbArgs, &numMemObjects, &memList, &argsMemLoc, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueNativeKernel, &commandQueue, &userFunc, &args, &cbArgs, &numMemObjects, &memList, &argsMemLoc, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_OUT_OF_HOST_MEMORY;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue, "userFunc", userFunc, "args", args,
@@ -3584,14 +3584,14 @@ cl_int CL_API_CALL clEnqueueNativeKernel(cl_command_queue commandQueue,
                    "eventWaitList", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(eventWaitList), numEventsInWaitList),
                    "event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1));
 
-    TRACING_EXIT(clEnqueueNativeKernel, &retVal);
+    TRACING_EXIT(ClEnqueueNativeKernel, &retVal);
     return retVal;
 }
 
 // deprecated OpenCL 1.1
 cl_int CL_API_CALL clEnqueueMarker(cl_command_queue commandQueue,
                                    cl_event *event) {
-    TRACING_ENTER(clEnqueueMarker, &commandQueue, &event);
+    TRACING_ENTER(ClEnqueueMarker, &commandQueue, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue, "cl_event", event);
@@ -3600,7 +3600,7 @@ cl_int CL_API_CALL clEnqueueMarker(cl_command_queue commandQueue,
     if (pCommandQueue) {
         if (!pCommandQueue->validateCapability(CL_QUEUE_CAPABILITY_MARKER_INTEL)) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueMarker, &retVal);
+            TRACING_EXIT(ClEnqueueMarker, &retVal);
             return retVal;
         }
 
@@ -3608,11 +3608,11 @@ cl_int CL_API_CALL clEnqueueMarker(cl_command_queue commandQueue,
             0,
             nullptr,
             event);
-        TRACING_EXIT(clEnqueueMarker, &retVal);
+        TRACING_EXIT(ClEnqueueMarker, &retVal);
         return retVal;
     }
     retVal = CL_INVALID_COMMAND_QUEUE;
-    TRACING_EXIT(clEnqueueMarker, &retVal);
+    TRACING_EXIT(ClEnqueueMarker, &retVal);
     return retVal;
 }
 
@@ -3620,7 +3620,7 @@ cl_int CL_API_CALL clEnqueueMarker(cl_command_queue commandQueue,
 cl_int CL_API_CALL clEnqueueWaitForEvents(cl_command_queue commandQueue,
                                           cl_uint numEvents,
                                           const cl_event *eventList) {
-    TRACING_ENTER(clEnqueueWaitForEvents, &commandQueue, &numEvents, &eventList);
+    TRACING_ENTER(ClEnqueueWaitForEvents, &commandQueue, &numEvents, &eventList);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue, "eventList", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(eventList), numEvents));
@@ -3628,7 +3628,7 @@ cl_int CL_API_CALL clEnqueueWaitForEvents(cl_command_queue commandQueue,
     auto pCommandQueue = castToObject<CommandQueue>(commandQueue);
     if (!pCommandQueue) {
         retVal = CL_INVALID_COMMAND_QUEUE;
-        TRACING_EXIT(clEnqueueWaitForEvents, &retVal);
+        TRACING_EXIT(ClEnqueueWaitForEvents, &retVal);
         return retVal;
     }
     for (unsigned int i = 0; i < numEvents && retVal == CL_SUCCESS; i++) {
@@ -3636,25 +3636,25 @@ cl_int CL_API_CALL clEnqueueWaitForEvents(cl_command_queue commandQueue,
     }
 
     if (retVal != CL_SUCCESS) {
-        TRACING_EXIT(clEnqueueWaitForEvents, &retVal);
+        TRACING_EXIT(ClEnqueueWaitForEvents, &retVal);
         return retVal;
     }
 
     if (!pCommandQueue->validateCapabilitiesForEventWaitList(numEvents, eventList)) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueWaitForEvents, &retVal);
+        TRACING_EXIT(ClEnqueueWaitForEvents, &retVal);
         return retVal;
     }
 
     retVal = Event::waitForEvents(numEvents, eventList);
 
-    TRACING_EXIT(clEnqueueWaitForEvents, &retVal);
+    TRACING_EXIT(ClEnqueueWaitForEvents, &retVal);
     return retVal;
 }
 
 // deprecated OpenCL 1.1
 cl_int CL_API_CALL clEnqueueBarrier(cl_command_queue commandQueue) {
-    TRACING_ENTER(clEnqueueBarrier, &commandQueue);
+    TRACING_ENTER(ClEnqueueBarrier, &commandQueue);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue);
@@ -3662,7 +3662,7 @@ cl_int CL_API_CALL clEnqueueBarrier(cl_command_queue commandQueue) {
     if (pCommandQueue) {
         if (!pCommandQueue->validateCapability(CL_QUEUE_CAPABILITY_BARRIER_INTEL)) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clEnqueueBarrier, &retVal);
+            TRACING_EXIT(ClEnqueueBarrier, &retVal);
             return retVal;
         }
 
@@ -3670,11 +3670,11 @@ cl_int CL_API_CALL clEnqueueBarrier(cl_command_queue commandQueue) {
             0,
             nullptr,
             nullptr);
-        TRACING_EXIT(clEnqueueBarrier, &retVal);
+        TRACING_EXIT(ClEnqueueBarrier, &retVal);
         return retVal;
     }
     retVal = CL_INVALID_COMMAND_QUEUE;
-    TRACING_EXIT(clEnqueueBarrier, &retVal);
+    TRACING_EXIT(ClEnqueueBarrier, &retVal);
     return retVal;
 }
 
@@ -3682,7 +3682,7 @@ cl_int CL_API_CALL clEnqueueMarkerWithWaitList(cl_command_queue commandQueue,
                                                cl_uint numEventsInWaitList,
                                                const cl_event *eventWaitList,
                                                cl_event *event) {
-    TRACING_ENTER(clEnqueueMarkerWithWaitList, &commandQueue, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueMarkerWithWaitList, &commandQueue, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("cl_command_queue", commandQueue,
@@ -3696,13 +3696,13 @@ cl_int CL_API_CALL clEnqueueMarkerWithWaitList(cl_command_queue commandQueue,
         EventWaitList(numEventsInWaitList, eventWaitList));
 
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clEnqueueMarkerWithWaitList, &retVal);
+        TRACING_EXIT(ClEnqueueMarkerWithWaitList, &retVal);
         return retVal;
     }
 
     if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_MARKER_INTEL, numEventsInWaitList, eventWaitList, event)) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueMarkerWithWaitList, &retVal);
+        TRACING_EXIT(ClEnqueueMarkerWithWaitList, &retVal);
         return retVal;
     }
 
@@ -3710,7 +3710,7 @@ cl_int CL_API_CALL clEnqueueMarkerWithWaitList(cl_command_queue commandQueue,
         numEventsInWaitList,
         eventWaitList,
         event);
-    TRACING_EXIT(clEnqueueMarkerWithWaitList, &retVal);
+    TRACING_EXIT(ClEnqueueMarkerWithWaitList, &retVal);
     return retVal;
 }
 
@@ -3718,7 +3718,7 @@ cl_int CL_API_CALL clEnqueueBarrierWithWaitList(cl_command_queue commandQueue,
                                                 cl_uint numEventsInWaitList,
                                                 const cl_event *eventWaitList,
                                                 cl_event *event) {
-    TRACING_ENTER(clEnqueueBarrierWithWaitList, &commandQueue, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueBarrierWithWaitList, &commandQueue, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("cl_command_queue", commandQueue,
@@ -3733,13 +3733,13 @@ cl_int CL_API_CALL clEnqueueBarrierWithWaitList(cl_command_queue commandQueue,
         EventWaitList(numEventsInWaitList, eventWaitList));
 
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clEnqueueBarrierWithWaitList, &retVal);
+        TRACING_EXIT(ClEnqueueBarrierWithWaitList, &retVal);
         return retVal;
     }
 
     if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_BARRIER_INTEL, numEventsInWaitList, eventWaitList, event)) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueBarrierWithWaitList, &retVal);
+        TRACING_EXIT(ClEnqueueBarrierWithWaitList, &retVal);
         return retVal;
     }
 
@@ -3747,7 +3747,7 @@ cl_int CL_API_CALL clEnqueueBarrierWithWaitList(cl_command_queue commandQueue,
         numEventsInWaitList,
         eventWaitList,
         event);
-    TRACING_EXIT(clEnqueueBarrierWithWaitList, &retVal);
+    TRACING_EXIT(ClEnqueueBarrierWithWaitList, &retVal);
     return retVal;
 }
 
@@ -4387,12 +4387,12 @@ cl_int CL_API_CALL clGetKernelSuggestedLocalWorkSizeKHR(cl_command_queue command
     {                                                                   \
         if (!strcmp(funcName, #name)) {                                 \
             void *ret = ((void *)(name));                               \
-            TRACING_EXIT(clGetExtensionFunctionAddress, (void **)&ret); \
+            TRACING_EXIT(ClGetExtensionFunctionAddress, (void **)&ret); \
             return ret;                                                 \
         }                                                               \
     }
 void *CL_API_CALL clGetExtensionFunctionAddress(const char *funcName) {
-    TRACING_ENTER(clGetExtensionFunctionAddress, &funcName);
+    TRACING_ENTER(ClGetExtensionFunctionAddress, &funcName);
 
     DBG_LOG_INPUTS("funcName", funcName);
     // Support an internal call by the ICD
@@ -4438,7 +4438,7 @@ void *CL_API_CALL clGetExtensionFunctionAddress(const char *funcName) {
 
     void *ret = sharingFactory.getExtensionFunctionAddress(funcName);
     if (ret != nullptr) {
-        TRACING_EXIT(clGetExtensionFunctionAddress, &ret);
+        TRACING_EXIT(ClGetExtensionFunctionAddress, &ret);
         return ret;
     }
 
@@ -4451,25 +4451,25 @@ void *CL_API_CALL clGetExtensionFunctionAddress(const char *funcName) {
     RETURN_FUNC_PTR_IF_EXIST(clGetKernelSuggestedLocalWorkSizeKHR);
 
     ret = getAdditionalExtensionFunctionAddress(funcName);
-    TRACING_EXIT(clGetExtensionFunctionAddress, &ret);
+    TRACING_EXIT(ClGetExtensionFunctionAddress, &ret);
     return ret;
 }
 
 // OpenCL 1.2
 void *CL_API_CALL clGetExtensionFunctionAddressForPlatform(cl_platform_id platform,
                                                            const char *funcName) {
-    TRACING_ENTER(clGetExtensionFunctionAddressForPlatform, &platform, &funcName);
+    TRACING_ENTER(ClGetExtensionFunctionAddressForPlatform, &platform, &funcName);
     DBG_LOG_INPUTS("platform", platform, "funcName", funcName);
     auto pPlatform = castToObject<Platform>(platform);
 
     if (pPlatform == nullptr) {
         void *ret = nullptr;
-        TRACING_EXIT(clGetExtensionFunctionAddressForPlatform, &ret);
+        TRACING_EXIT(ClGetExtensionFunctionAddressForPlatform, &ret);
         return ret;
     }
 
     void *ret = clGetExtensionFunctionAddress(funcName);
-    TRACING_EXIT(clGetExtensionFunctionAddressForPlatform, &ret);
+    TRACING_EXIT(ClGetExtensionFunctionAddressForPlatform, &ret);
     return ret;
 }
 
@@ -4477,7 +4477,7 @@ void *CL_API_CALL clSVMAlloc(cl_context context,
                              cl_svm_mem_flags flags,
                              size_t size,
                              cl_uint alignment) {
-    TRACING_ENTER(clSVMAlloc, &context, &flags, &size, &alignment);
+    TRACING_ENTER(ClSvmAlloc, &context, &flags, &size, &alignment);
     DBG_LOG_INPUTS("context", context,
                    "flags", flags,
                    "size", size,
@@ -4486,7 +4486,7 @@ void *CL_API_CALL clSVMAlloc(cl_context context,
     Context *pContext = nullptr;
 
     if (validateObjects(withCastToInternal(context, &pContext)) != CL_SUCCESS) {
-        TRACING_EXIT(clSVMAlloc, &pAlloc);
+        TRACING_EXIT(ClSvmAlloc, &pAlloc);
         return pAlloc;
     }
 
@@ -4510,7 +4510,7 @@ void *CL_API_CALL clSVMAlloc(cl_context context,
               (tempFlags == (CL_MEM_READ_ONLY | CL_MEM_SVM_FINE_GRAIN_BUFFER)) ||
               (tempFlags == (CL_MEM_READ_ONLY | CL_MEM_SVM_FINE_GRAIN_BUFFER | CL_MEM_SVM_ATOMICS)))) {
 
-            TRACING_EXIT(clSVMAlloc, &pAlloc);
+            TRACING_EXIT(ClSvmAlloc, &pAlloc);
             return pAlloc;
         }
     }
@@ -4520,18 +4520,18 @@ void *CL_API_CALL clSVMAlloc(cl_context context,
 
     if ((size == 0) ||
         (!allowUnrestrictedSize && (size > pDevice->getSharedDeviceInfo().maxMemAllocSize))) {
-        TRACING_EXIT(clSVMAlloc, &pAlloc);
+        TRACING_EXIT(ClSvmAlloc, &pAlloc);
         return pAlloc;
     }
 
     if ((alignment && (alignment & (alignment - 1))) || (alignment > sizeof(cl_ulong16))) {
-        TRACING_EXIT(clSVMAlloc, &pAlloc);
+        TRACING_EXIT(ClSvmAlloc, &pAlloc);
         return pAlloc;
     }
 
     const HardwareInfo &hwInfo = pDevice->getHardwareInfo();
     if (!hwInfo.capabilityTable.ftrSvm) {
-        TRACING_EXIT(clSVMAlloc, &pAlloc);
+        TRACING_EXIT(ClSvmAlloc, &pAlloc);
         return pAlloc;
     }
 
@@ -4541,7 +4541,7 @@ void *CL_API_CALL clSVMAlloc(cl_context context,
             supportsFineGrained = !!DebugManager.flags.ForceFineGrainedSVMSupport.get();
         }
         if (!supportsFineGrained) {
-            TRACING_EXIT(clSVMAlloc, &pAlloc);
+            TRACING_EXIT(ClSvmAlloc, &pAlloc);
             return pAlloc;
         }
     }
@@ -4551,13 +4551,13 @@ void *CL_API_CALL clSVMAlloc(cl_context context,
     if (pContext->isProvidingPerformanceHints()) {
         pContext->providePerformanceHint(CL_CONTEXT_DIAGNOSTICS_LEVEL_GOOD_INTEL, CL_SVM_ALLOC_MEETS_ALIGNMENT_RESTRICTIONS, pAlloc, size);
     }
-    TRACING_EXIT(clSVMAlloc, &pAlloc);
+    TRACING_EXIT(ClSvmAlloc, &pAlloc);
     return pAlloc;
 }
 
 void CL_API_CALL clSVMFree(cl_context context,
                            void *svmPointer) {
-    TRACING_ENTER(clSVMFree, &context, &svmPointer);
+    TRACING_ENTER(ClSvmFree, &context, &svmPointer);
     DBG_LOG_INPUTS("context", context,
                    "svmPointer", svmPointer);
 
@@ -4566,18 +4566,18 @@ void CL_API_CALL clSVMFree(cl_context context,
         withCastToInternal(context, &pContext));
 
     if (retVal != CL_SUCCESS) {
-        TRACING_EXIT(clSVMFree, nullptr);
+        TRACING_EXIT(ClSvmFree, nullptr);
         return;
     }
 
     auto pClDevice = pContext->getDevice(0);
     if (!pClDevice->getHardwareInfo().capabilityTable.ftrSvm) {
-        TRACING_EXIT(clSVMFree, nullptr);
+        TRACING_EXIT(ClSvmFree, nullptr);
         return;
     }
 
     pContext->getSVMAllocsManager()->freeSVMAlloc(svmPointer);
-    TRACING_EXIT(clSVMFree, nullptr);
+    TRACING_EXIT(ClSvmFree, nullptr);
 }
 
 cl_int CL_API_CALL clEnqueueSVMFree(cl_command_queue commandQueue,
@@ -4591,7 +4591,7 @@ cl_int CL_API_CALL clEnqueueSVMFree(cl_command_queue commandQueue,
                                     cl_uint numEventsInWaitList,
                                     const cl_event *eventWaitList,
                                     cl_event *event) {
-    TRACING_ENTER(clEnqueueSVMFree, &commandQueue, &numSvmPointers, &svmPointers, &pfnFreeFunc, &userData, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueSvmFree, &commandQueue, &numSvmPointers, &svmPointers, &pfnFreeFunc, &userData, &numEventsInWaitList, &eventWaitList, &event);
 
     CommandQueue *pCommandQueue = nullptr;
 
@@ -4611,21 +4611,21 @@ cl_int CL_API_CALL clEnqueueSVMFree(cl_command_queue commandQueue,
                    "event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1));
 
     if (retVal != CL_SUCCESS) {
-        TRACING_EXIT(clEnqueueSVMFree, &retVal);
+        TRACING_EXIT(ClEnqueueSvmFree, &retVal);
         return retVal;
     }
 
     auto &device = pCommandQueue->getDevice();
     if (!device.getHardwareInfo().capabilityTable.ftrSvm) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueSVMFree, &retVal);
+        TRACING_EXIT(ClEnqueueSvmFree, &retVal);
         return retVal;
     }
 
     if (((svmPointers != nullptr) && (numSvmPointers == 0)) ||
         ((svmPointers == nullptr) && (numSvmPointers != 0))) {
         retVal = CL_INVALID_VALUE;
-        TRACING_EXIT(clEnqueueSVMFree, &retVal);
+        TRACING_EXIT(ClEnqueueSvmFree, &retVal);
         return retVal;
     }
 
@@ -4638,7 +4638,7 @@ cl_int CL_API_CALL clEnqueueSVMFree(cl_command_queue commandQueue,
         eventWaitList,
         event);
 
-    TRACING_EXIT(clEnqueueSVMFree, &retVal);
+    TRACING_EXIT(ClEnqueueSvmFree, &retVal);
     return retVal;
 }
 
@@ -4650,7 +4650,7 @@ cl_int CL_API_CALL clEnqueueSVMMemcpy(cl_command_queue commandQueue,
                                       cl_uint numEventsInWaitList,
                                       const cl_event *eventWaitList,
                                       cl_event *event) {
-    TRACING_ENTER(clEnqueueSVMMemcpy, &commandQueue, &blockingCopy, &dstPtr, &srcPtr, &size, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueSvmMemcpy, &commandQueue, &blockingCopy, &dstPtr, &srcPtr, &size, &numEventsInWaitList, &eventWaitList, &event);
 
     CommandQueue *pCommandQueue = nullptr;
 
@@ -4670,26 +4670,26 @@ cl_int CL_API_CALL clEnqueueSVMMemcpy(cl_command_queue commandQueue,
                    "event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1));
 
     if (retVal != CL_SUCCESS) {
-        TRACING_EXIT(clEnqueueSVMMemcpy, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMemcpy, &retVal);
         return retVal;
     }
 
     auto &device = pCommandQueue->getDevice();
     if (!device.getHardwareInfo().capabilityTable.ftrSvm) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueSVMMemcpy, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMemcpy, &retVal);
         return retVal;
     }
 
     if ((dstPtr == nullptr) || (srcPtr == nullptr)) {
         retVal = CL_INVALID_VALUE;
-        TRACING_EXIT(clEnqueueSVMMemcpy, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMemcpy, &retVal);
         return retVal;
     }
 
     if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_TRANSFER_BUFFER_INTEL, numEventsInWaitList, eventWaitList, event)) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueSVMMemcpy, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMemcpy, &retVal);
         return retVal;
     }
 
@@ -4702,7 +4702,7 @@ cl_int CL_API_CALL clEnqueueSVMMemcpy(cl_command_queue commandQueue,
         eventWaitList,
         event);
 
-    TRACING_EXIT(clEnqueueSVMMemcpy, &retVal);
+    TRACING_EXIT(ClEnqueueSvmMemcpy, &retVal);
     return retVal;
 }
 
@@ -4714,7 +4714,7 @@ cl_int CL_API_CALL clEnqueueSVMMemFill(cl_command_queue commandQueue,
                                        cl_uint numEventsInWaitList,
                                        const cl_event *eventWaitList,
                                        cl_event *event) {
-    TRACING_ENTER(clEnqueueSVMMemFill, &commandQueue, &svmPtr, &pattern, &patternSize, &size, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueSvmMemFill, &commandQueue, &svmPtr, &pattern, &patternSize, &size, &numEventsInWaitList, &eventWaitList, &event);
 
     CommandQueue *pCommandQueue = nullptr;
 
@@ -4734,26 +4734,26 @@ cl_int CL_API_CALL clEnqueueSVMMemFill(cl_command_queue commandQueue,
                    "event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1));
 
     if (retVal != CL_SUCCESS) {
-        TRACING_EXIT(clEnqueueSVMMemFill, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMemFill, &retVal);
         return retVal;
     }
 
     auto &device = pCommandQueue->getDevice();
     if (!device.getHardwareInfo().capabilityTable.ftrSvm) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueSVMMemFill, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMemFill, &retVal);
         return retVal;
     }
 
     if ((svmPtr == nullptr) || (size == 0)) {
         retVal = CL_INVALID_VALUE;
-        TRACING_EXIT(clEnqueueSVMMemFill, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMemFill, &retVal);
         return retVal;
     }
 
     if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_FILL_BUFFER_INTEL, numEventsInWaitList, eventWaitList, event)) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueSVMMemFill, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMemFill, &retVal);
         return retVal;
     }
 
@@ -4766,7 +4766,7 @@ cl_int CL_API_CALL clEnqueueSVMMemFill(cl_command_queue commandQueue,
         eventWaitList,
         event);
 
-    TRACING_EXIT(clEnqueueSVMMemFill, &retVal);
+    TRACING_EXIT(ClEnqueueSvmMemFill, &retVal);
     return retVal;
 }
 
@@ -4778,7 +4778,7 @@ cl_int CL_API_CALL clEnqueueSVMMap(cl_command_queue commandQueue,
                                    cl_uint numEventsInWaitList,
                                    const cl_event *eventWaitList,
                                    cl_event *event) {
-    TRACING_ENTER(clEnqueueSVMMap, &commandQueue, &blockingMap, &mapFlags, &svmPtr, &size, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueSvmMap, &commandQueue, &blockingMap, &mapFlags, &svmPtr, &size, &numEventsInWaitList, &eventWaitList, &event);
 
     CommandQueue *pCommandQueue = nullptr;
 
@@ -4796,26 +4796,26 @@ cl_int CL_API_CALL clEnqueueSVMMap(cl_command_queue commandQueue,
                    "event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1));
 
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clEnqueueSVMMap, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMap, &retVal);
         return retVal;
     }
 
     auto &device = pCommandQueue->getDevice();
     if (!device.getHardwareInfo().capabilityTable.ftrSvm) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueSVMMap, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMap, &retVal);
         return retVal;
     }
 
     if ((svmPtr == nullptr) || (size == 0)) {
         retVal = CL_INVALID_VALUE;
-        TRACING_EXIT(clEnqueueSVMMap, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMap, &retVal);
         return retVal;
     }
 
     if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_MAP_BUFFER_INTEL, numEventsInWaitList, eventWaitList, event)) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueSVMMap, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMap, &retVal);
         return retVal;
     }
 
@@ -4829,7 +4829,7 @@ cl_int CL_API_CALL clEnqueueSVMMap(cl_command_queue commandQueue,
         event,
         true);
 
-    TRACING_EXIT(clEnqueueSVMMap, &retVal);
+    TRACING_EXIT(ClEnqueueSvmMap, &retVal);
     return retVal;
 }
 
@@ -4838,7 +4838,7 @@ cl_int CL_API_CALL clEnqueueSVMUnmap(cl_command_queue commandQueue,
                                      cl_uint numEventsInWaitList,
                                      const cl_event *eventWaitList,
                                      cl_event *event) {
-    TRACING_ENTER(clEnqueueSVMUnmap, &commandQueue, &svmPtr, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueSvmUnmap, &commandQueue, &svmPtr, &numEventsInWaitList, &eventWaitList, &event);
 
     CommandQueue *pCommandQueue = nullptr;
 
@@ -4856,20 +4856,20 @@ cl_int CL_API_CALL clEnqueueSVMUnmap(cl_command_queue commandQueue,
                    "event", getClFileLogger().getEvents(reinterpret_cast<const uintptr_t *>(event), 1));
 
     if (retVal != CL_SUCCESS) {
-        TRACING_EXIT(clEnqueueSVMUnmap, &retVal);
+        TRACING_EXIT(ClEnqueueSvmUnmap, &retVal);
         return retVal;
     }
 
     auto &device = pCommandQueue->getDevice();
     if (!device.getHardwareInfo().capabilityTable.ftrSvm) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueSVMUnmap, &retVal);
+        TRACING_EXIT(ClEnqueueSvmUnmap, &retVal);
         return retVal;
     }
 
     if (!pCommandQueue->validateCapabilityForOperation(CL_QUEUE_CAPABILITY_MAP_BUFFER_INTEL, numEventsInWaitList, eventWaitList, event)) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueSVMUnmap, &retVal);
+        TRACING_EXIT(ClEnqueueSvmUnmap, &retVal);
         return retVal;
     }
 
@@ -4880,14 +4880,14 @@ cl_int CL_API_CALL clEnqueueSVMUnmap(cl_command_queue commandQueue,
         event,
         true);
 
-    TRACING_EXIT(clEnqueueSVMUnmap, &retVal);
+    TRACING_EXIT(ClEnqueueSvmUnmap, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clSetKernelArgSVMPointer(cl_kernel kernel,
                                             cl_uint argIndex,
                                             const void *argValue) {
-    TRACING_ENTER(clSetKernelArgSVMPointer, &kernel, &argIndex, &argValue);
+    TRACING_ENTER(ClSetKernelArgSvmPointer, &kernel, &argIndex, &argValue);
 
     MultiDeviceKernel *pMultiDeviceKernel = nullptr;
 
@@ -4895,13 +4895,13 @@ cl_int CL_API_CALL clSetKernelArgSVMPointer(cl_kernel kernel,
     API_ENTER(&retVal);
 
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clSetKernelArgSVMPointer, &retVal);
+        TRACING_EXIT(ClSetKernelArgSvmPointer, &retVal);
         return retVal;
     }
 
     if (argIndex >= pMultiDeviceKernel->getKernelArgsNumber()) {
         retVal = CL_INVALID_ARG_INDEX;
-        TRACING_EXIT(clSetKernelArgSVMPointer, &retVal);
+        TRACING_EXIT(ClSetKernelArgSvmPointer, &retVal);
         return retVal;
     }
 
@@ -4923,14 +4923,14 @@ cl_int CL_API_CALL clSetKernelArgSVMPointer(cl_kernel kernel,
                     }
                 }
                 if (reuseFromCache) {
-                    TRACING_EXIT(clSetKernelArgSVMPointer, &retVal);
+                    TRACING_EXIT(ClSetKernelArgSvmPointer, &retVal);
                     return CL_SUCCESS;
                 }
             }
         }
     } else {
         if (pMultiDeviceKernel->getKernelArguments()[argIndex].isSetToNullptr) {
-            TRACING_EXIT(clSetKernelArgSVMPointer, &retVal);
+            TRACING_EXIT(ClSetKernelArgSvmPointer, &retVal);
             return CL_SUCCESS;
         }
     }
@@ -4941,7 +4941,7 @@ cl_int CL_API_CALL clSetKernelArgSVMPointer(cl_kernel kernel,
         const HardwareInfo &hwInfo = pDevice->getHardwareInfo();
         if (!hwInfo.capabilityTable.ftrSvm) {
             retVal = CL_INVALID_OPERATION;
-            TRACING_EXIT(clSetKernelArgSVMPointer, &retVal);
+            TRACING_EXIT(ClSetKernelArgSvmPointer, &retVal);
             return retVal;
         }
     }
@@ -4955,7 +4955,7 @@ cl_int CL_API_CALL clSetKernelArgSVMPointer(cl_kernel kernel,
         if ((kernelArgAddressQualifier != CL_KERNEL_ARG_ADDRESS_GLOBAL) &&
             (kernelArgAddressQualifier != CL_KERNEL_ARG_ADDRESS_CONSTANT)) {
             retVal = CL_INVALID_ARG_VALUE;
-            TRACING_EXIT(clSetKernelArgSVMPointer, &retVal);
+            TRACING_EXIT(ClSetKernelArgSvmPointer, &retVal);
             return retVal;
         }
     }
@@ -4968,7 +4968,7 @@ cl_int CL_API_CALL clSetKernelArgSVMPointer(cl_kernel kernel,
             for (const auto &pDevice : pMultiDeviceKernel->getDevices()) {
                 if (!pDevice->areSharedSystemAllocationsAllowed()) {
                     retVal = CL_INVALID_ARG_VALUE;
-                    TRACING_EXIT(clSetKernelArgSVMPointer, &retVal);
+                    TRACING_EXIT(ClSetKernelArgSvmPointer, &retVal);
                     return retVal;
                 }
             }
@@ -4979,7 +4979,7 @@ cl_int CL_API_CALL clSetKernelArgSVMPointer(cl_kernel kernel,
     }
 
     retVal = pMultiDeviceKernel->setArgSvmAlloc(argIndex, const_cast<void *>(argValue), pSvmAllocs, allocId);
-    TRACING_EXIT(clSetKernelArgSVMPointer, &retVal);
+    TRACING_EXIT(ClSetKernelArgSvmPointer, &retVal);
     return retVal;
 }
 
@@ -4987,7 +4987,7 @@ cl_int CL_API_CALL clSetKernelExecInfo(cl_kernel kernel,
                                        cl_kernel_exec_info paramName,
                                        size_t paramValueSize,
                                        const void *paramValue) {
-    TRACING_ENTER(clSetKernelExecInfo, &kernel, &paramName, &paramValueSize, &paramValue);
+    TRACING_ENTER(ClSetKernelExecInfo, &kernel, &paramName, &paramValueSize, &paramValue);
 
     MultiDeviceKernel *pMultiDeviceKernel = nullptr;
     auto retVal = validateObjects(withCastToInternal(kernel, &pMultiDeviceKernel));
@@ -4997,7 +4997,7 @@ cl_int CL_API_CALL clSetKernelExecInfo(cl_kernel kernel,
                    "paramValueSize", paramValueSize, "paramValue", NEO::fileLoggerInstance().infoPointerToString(paramValue, paramValueSize));
 
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clSetKernelExecInfo, &retVal);
+        TRACING_EXIT(ClSetKernelExecInfo, &retVal);
         return retVal;
     }
 
@@ -5008,7 +5008,7 @@ cl_int CL_API_CALL clSetKernelExecInfo(cl_kernel kernel,
             const HardwareInfo &hwInfo = pDevice->getHardwareInfo();
             if (!hwInfo.capabilityTable.ftrSvm) {
                 retVal = CL_INVALID_OPERATION;
-                TRACING_EXIT(clSetKernelExecInfo, &retVal);
+                TRACING_EXIT(ClSetKernelExecInfo, &retVal);
                 return retVal;
             }
         }
@@ -5030,7 +5030,7 @@ cl_int CL_API_CALL clSetKernelExecInfo(cl_kernel kernel,
             (paramValueSize % sizeof(void *)) ||
             (paramValue == nullptr)) {
             retVal = CL_INVALID_VALUE;
-            TRACING_EXIT(clSetKernelExecInfo, &retVal);
+            TRACING_EXIT(ClSetKernelExecInfo, &retVal);
             return retVal;
         }
         size_t numPointers = paramValueSize / sizeof(void *);
@@ -5046,7 +5046,7 @@ cl_int CL_API_CALL clSetKernelExecInfo(cl_kernel kernel,
             auto svmData = pMultiDeviceKernel->getContext().getSVMAllocsManager()->getSVMAlloc((const void *)pSvmPtrList[i]);
             if (svmData == nullptr) {
                 retVal = CL_INVALID_VALUE;
-                TRACING_EXIT(clSetKernelExecInfo, &retVal);
+                TRACING_EXIT(ClSetKernelExecInfo, &retVal);
                 return retVal;
             }
             auto &svmAllocs = svmData->gpuAllocations;
@@ -5066,29 +5066,29 @@ cl_int CL_API_CALL clSetKernelExecInfo(cl_kernel kernel,
     }
     case CL_KERNEL_EXEC_INFO_SVM_FINE_GRAIN_SYSTEM: {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clSetKernelExecInfo, &retVal);
+        TRACING_EXIT(ClSetKernelExecInfo, &retVal);
         return retVal;
     }
     case CL_KERNEL_EXEC_INFO_KERNEL_TYPE_INTEL: {
         if (paramValueSize != sizeof(cl_execution_info_kernel_type_intel) ||
             paramValue == nullptr) {
             retVal = CL_INVALID_VALUE;
-            TRACING_EXIT(clSetKernelExecInfo, &retVal);
+            TRACING_EXIT(ClSetKernelExecInfo, &retVal);
             return retVal;
         }
         auto kernelType = *static_cast<const cl_execution_info_kernel_type_intel *>(paramValue);
         retVal = pMultiDeviceKernel->setKernelExecutionType(kernelType);
-        TRACING_EXIT(clSetKernelExecInfo, &retVal);
+        TRACING_EXIT(ClSetKernelExecInfo, &retVal);
         return retVal;
     }
     default: {
         retVal = pMultiDeviceKernel->setAdditionalKernelExecInfoWithParam(paramName, paramValueSize, paramValue);
-        TRACING_EXIT(clSetKernelExecInfo, &retVal);
+        TRACING_EXIT(ClSetKernelExecInfo, &retVal);
         return retVal;
     }
     }
 
-    TRACING_EXIT(clSetKernelExecInfo, &retVal);
+    TRACING_EXIT(ClSetKernelExecInfo, &retVal);
     return retVal;
 };
 
@@ -5098,7 +5098,7 @@ cl_mem CL_API_CALL clCreatePipe(cl_context context,
                                 cl_uint pipeMaxPackets,
                                 const cl_pipe_properties *properties,
                                 cl_int *errcodeRet) {
-    TRACING_ENTER(clCreatePipe, &context, &flags, &pipePacketSize, &pipeMaxPackets, &properties, &errcodeRet);
+    TRACING_ENTER(ClCreatePipe, &context, &flags, &pipePacketSize, &pipeMaxPackets, &properties, &errcodeRet);
     cl_mem pipe = nullptr;
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
@@ -5156,7 +5156,7 @@ cl_mem CL_API_CALL clCreatePipe(cl_context context,
         *errcodeRet = retVal;
     }
     DBG_LOG_INPUTS("pipe", pipe);
-    TRACING_EXIT(clCreatePipe, &pipe);
+    TRACING_EXIT(ClCreatePipe, &pipe);
     return pipe;
 }
 
@@ -5165,7 +5165,7 @@ cl_int CL_API_CALL clGetPipeInfo(cl_mem pipe,
                                  size_t paramValueSize,
                                  void *paramValue,
                                  size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetPipeInfo, &pipe, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetPipeInfo, &pipe, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
 
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
@@ -5178,7 +5178,7 @@ cl_int CL_API_CALL clGetPipeInfo(cl_mem pipe,
 
     retVal = validateObjects(pipe);
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clGetPipeInfo, &retVal);
+        TRACING_EXIT(ClGetPipeInfo, &retVal);
         return retVal;
     }
 
@@ -5186,12 +5186,12 @@ cl_int CL_API_CALL clGetPipeInfo(cl_mem pipe,
 
     if (pPipeObj == nullptr) {
         retVal = CL_INVALID_MEM_OBJECT;
-        TRACING_EXIT(clGetPipeInfo, &retVal);
+        TRACING_EXIT(ClGetPipeInfo, &retVal);
         return retVal;
     }
 
     retVal = pPipeObj->getPipeInfo(paramName, paramValueSize, paramValue, paramValueSizeRet);
-    TRACING_EXIT(clGetPipeInfo, &retVal);
+    TRACING_EXIT(ClGetPipeInfo, &retVal);
     return retVal;
 }
 
@@ -5199,7 +5199,7 @@ cl_command_queue CL_API_CALL clCreateCommandQueueWithProperties(cl_context conte
                                                                 cl_device_id device,
                                                                 const cl_queue_properties *properties,
                                                                 cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateCommandQueueWithProperties, &context, &device, &properties, &errcodeRet);
+    TRACING_ENTER(ClCreateCommandQueueWithProperties, &context, &device, &properties, &errcodeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("context", context,
@@ -5218,13 +5218,13 @@ cl_command_queue CL_API_CALL clCreateCommandQueueWithProperties(cl_context conte
 
     if (CL_SUCCESS != retVal) {
         err.set(retVal);
-        TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+        TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
         return commandQueue;
     }
 
     if (!pContext->isDeviceAssociated(*pDevice)) {
         err.set(CL_INVALID_DEVICE);
-        TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+        TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
         return commandQueue;
     }
 
@@ -5245,7 +5245,7 @@ cl_command_queue CL_API_CALL clCreateCommandQueueWithProperties(cl_context conte
             break;
         default:
             err.set(CL_INVALID_VALUE);
-            TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+            TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
             return commandQueue;
         }
 
@@ -5259,32 +5259,32 @@ cl_command_queue CL_API_CALL clCreateCommandQueueWithProperties(cl_context conte
     if (commandQueueProperties & static_cast<cl_command_queue_properties>(CL_QUEUE_ON_DEVICE)) {
         if (!(commandQueueProperties & static_cast<cl_command_queue_properties>(CL_QUEUE_OUT_OF_ORDER_EXEC_MODE_ENABLE))) {
             err.set(CL_INVALID_VALUE);
-            TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+            TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
             return commandQueue;
         }
         err.set(CL_INVALID_QUEUE_PROPERTIES);
-        TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+        TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
         return commandQueue;
     }
 
     if (commandQueueProperties & static_cast<cl_command_queue_properties>(CL_QUEUE_ON_DEVICE_DEFAULT)) {
         if (!(commandQueueProperties & static_cast<cl_command_queue_properties>(CL_QUEUE_ON_DEVICE))) {
             err.set(CL_INVALID_VALUE);
-            TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+            TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
             return commandQueue;
         }
     }
 
     if (getCmdQueueProperties<cl_command_queue_properties>(properties, CL_QUEUE_SIZE) > maxOnDeviceQueueSize) {
         err.set(CL_INVALID_QUEUE_PROPERTIES);
-        TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+        TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
         return commandQueue;
     }
 
     if (commandQueueProperties & static_cast<cl_command_queue_properties>(CL_QUEUE_ON_DEVICE)) {
         if (getCmdQueueProperties<cl_queue_priority_khr>(properties, CL_QUEUE_PRIORITY_KHR)) {
             err.set(CL_INVALID_QUEUE_PROPERTIES);
-            TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+            TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
             return commandQueue;
         }
     }
@@ -5292,14 +5292,14 @@ cl_command_queue CL_API_CALL clCreateCommandQueueWithProperties(cl_context conte
     if (commandQueueProperties & static_cast<cl_command_queue_properties>(CL_QUEUE_ON_DEVICE)) {
         if (getCmdQueueProperties<cl_queue_throttle_khr>(properties, CL_QUEUE_THROTTLE_KHR)) {
             err.set(CL_INVALID_QUEUE_PROPERTIES);
-            TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+            TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
             return commandQueue;
         }
     }
 
     if (getCmdQueueProperties<cl_command_queue_properties>(properties, CL_QUEUE_SLICE_COUNT_INTEL) > pDevice->getDeviceInfo().maxSliceCount) {
         err.set(CL_INVALID_QUEUE_PROPERTIES);
-        TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+        TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
         return commandQueue;
     }
 
@@ -5309,14 +5309,14 @@ cl_command_queue CL_API_CALL clCreateCommandQueueWithProperties(cl_context conte
     const auto queueIndex = getCmdQueueProperties<cl_uint>(properties, CL_QUEUE_INDEX_INTEL, &queueSelected);
     if (queueFamilySelected != queueSelected) {
         err.set(CL_INVALID_QUEUE_PROPERTIES);
-        TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+        TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
         return commandQueue;
     }
     if (queueFamilySelected &&
         (queueFamilyIndex >= pDevice->getDeviceInfo().queueFamilyProperties.size() ||
          queueIndex >= pDevice->getDeviceInfo().queueFamilyProperties[queueFamilyIndex].count)) {
         err.set(CL_INVALID_QUEUE_PROPERTIES);
-        TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+        TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
         return commandQueue;
     }
 
@@ -5327,7 +5327,7 @@ cl_command_queue CL_API_CALL clCreateCommandQueueWithProperties(cl_context conte
 
     if (mdapiConfigurationSet && mdapiConfiguration != 0) {
         err.set(CL_INVALID_OPERATION);
-        TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+        TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
         return commandQueue;
     }
 
@@ -5343,7 +5343,7 @@ cl_command_queue CL_API_CALL clCreateCommandQueueWithProperties(cl_context conte
 
         if (!commandQueueObj->setPerfCountersEnabled()) {
             clReleaseCommandQueue(commandQueue);
-            TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+            TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
 
             err.set(CL_OUT_OF_RESOURCES);
             return nullptr;
@@ -5368,14 +5368,14 @@ cl_command_queue CL_API_CALL clCreateCommandQueueWithProperties(cl_context conte
 
     err.set(retVal);
 
-    TRACING_EXIT(clCreateCommandQueueWithProperties, &commandQueue);
+    TRACING_EXIT(ClCreateCommandQueueWithProperties, &commandQueue);
     return commandQueue;
 }
 
 cl_sampler CL_API_CALL clCreateSamplerWithProperties(cl_context context,
                                                      const cl_sampler_properties *samplerProperties,
                                                      cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateSamplerWithProperties, &context, &samplerProperties, &errcodeRet);
+    TRACING_ENTER(ClCreateSamplerWithProperties, &context, &samplerProperties, &errcodeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("context", context,
@@ -5394,15 +5394,15 @@ cl_sampler CL_API_CALL clCreateSamplerWithProperties(cl_context context,
         *errcodeRet = retVal;
     }
 
-    TRACING_EXIT(clCreateSamplerWithProperties, &sampler);
+    TRACING_EXIT(ClCreateSamplerWithProperties, &sampler);
     return sampler;
 }
 
 cl_int CL_API_CALL clUnloadCompiler() {
-    TRACING_ENTER(clUnloadCompiler);
+    TRACING_ENTER(ClUnloadCompiler);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
-    TRACING_EXIT(clUnloadCompiler, &retVal);
+    TRACING_EXIT(ClUnloadCompiler, &retVal);
     return retVal;
 }
 
@@ -5460,7 +5460,7 @@ cl_int CL_API_CALL clGetKernelSubGroupInfoKHR(cl_kernel kernel,
 cl_int CL_API_CALL clGetDeviceAndHostTimer(cl_device_id device,
                                            cl_ulong *deviceTimestamp,
                                            cl_ulong *hostTimestamp) {
-    TRACING_ENTER(clGetDeviceAndHostTimer, &device, &deviceTimestamp, &hostTimestamp);
+    TRACING_ENTER(ClGetDeviceAndHostTimer, &device, &deviceTimestamp, &hostTimestamp);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("device", device,
@@ -5482,13 +5482,13 @@ cl_int CL_API_CALL clGetDeviceAndHostTimer(cl_device_id device,
         }
     } while (false);
 
-    TRACING_EXIT(clGetDeviceAndHostTimer, &retVal);
+    TRACING_EXIT(ClGetDeviceAndHostTimer, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clGetHostTimer(cl_device_id device,
                                   cl_ulong *hostTimestamp) {
-    TRACING_ENTER(clGetHostTimer, &device, &hostTimestamp);
+    TRACING_ENTER(ClGetHostTimer, &device, &hostTimestamp);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("device", device,
@@ -5510,7 +5510,7 @@ cl_int CL_API_CALL clGetHostTimer(cl_device_id device,
         }
     } while (false);
 
-    TRACING_EXIT(clGetHostTimer, &retVal);
+    TRACING_EXIT(ClGetHostTimer, &retVal);
     return retVal;
 }
 
@@ -5522,7 +5522,7 @@ cl_int CL_API_CALL clGetKernelSubGroupInfo(cl_kernel kernel,
                                            size_t paramValueSize,
                                            void *paramValue,
                                            size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetKernelSubGroupInfo, &kernel, &device, &paramName, &inputValueSize, &inputValue, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetKernelSubGroupInfo, &kernel, &device, &paramName, &inputValueSize, &inputValue, &paramValueSize, &paramValue, &paramValueSizeRet);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("kernel", kernel,
@@ -5547,7 +5547,7 @@ cl_int CL_API_CALL clGetKernelSubGroupInfo(cl_kernel kernel,
     }
 
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clGetKernelSubGroupInfo, &retVal);
+        TRACING_EXIT(ClGetKernelSubGroupInfo, &retVal);
         return retVal;
     }
 
@@ -5556,14 +5556,14 @@ cl_int CL_API_CALL clGetKernelSubGroupInfo(cl_kernel kernel,
                                       inputValueSize, inputValue,
                                       paramValueSize, paramValue,
                                       paramValueSizeRet);
-    TRACING_EXIT(clGetKernelSubGroupInfo, &retVal);
+    TRACING_EXIT(ClGetKernelSubGroupInfo, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clSetDefaultDeviceCommandQueue(cl_context context,
                                                   cl_device_id device,
                                                   cl_command_queue commandQueue) {
-    TRACING_ENTER(clSetDefaultDeviceCommandQueue, &context, &device, &commandQueue);
+    TRACING_ENTER(ClSetDefaultDeviceCommandQueue, &context, &device, &commandQueue);
 
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
@@ -5578,12 +5578,12 @@ cl_int CL_API_CALL clSetDefaultDeviceCommandQueue(cl_context context,
                              withCastToInternal(device, &pClDevice));
 
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clSetDefaultDeviceCommandQueue, &retVal);
+        TRACING_EXIT(ClSetDefaultDeviceCommandQueue, &retVal);
         return retVal;
     }
 
     retVal = CL_INVALID_OPERATION;
-    TRACING_EXIT(clSetDefaultDeviceCommandQueue, &retVal);
+    TRACING_EXIT(ClSetDefaultDeviceCommandQueue, &retVal);
     return retVal;
 }
 
@@ -5595,7 +5595,7 @@ cl_int CL_API_CALL clEnqueueSVMMigrateMem(cl_command_queue commandQueue,
                                           cl_uint numEventsInWaitList,
                                           const cl_event *eventWaitList,
                                           cl_event *event) {
-    TRACING_ENTER(clEnqueueSVMMigrateMem, &commandQueue, &numSvmPointers, &svmPointers, &sizes, &flags, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueSvmMigrateMem, &commandQueue, &numSvmPointers, &svmPointers, &sizes, &flags, &numEventsInWaitList, &eventWaitList, &event);
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
     DBG_LOG_INPUTS("commandQueue", commandQueue,
@@ -5613,20 +5613,20 @@ cl_int CL_API_CALL clEnqueueSVMMigrateMem(cl_command_queue commandQueue,
         EventWaitList(numEventsInWaitList, eventWaitList));
 
     if (CL_SUCCESS != retVal) {
-        TRACING_EXIT(clEnqueueSVMMigrateMem, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMigrateMem, &retVal);
         return retVal;
     }
 
     auto &device = pCommandQueue->getDevice();
     if (!device.getHardwareInfo().capabilityTable.ftrSvm) {
         retVal = CL_INVALID_OPERATION;
-        TRACING_EXIT(clEnqueueSVMMigrateMem, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMigrateMem, &retVal);
         return retVal;
     }
 
     if (numSvmPointers == 0 || svmPointers == nullptr) {
         retVal = CL_INVALID_VALUE;
-        TRACING_EXIT(clEnqueueSVMMigrateMem, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMigrateMem, &retVal);
         return retVal;
     }
 
@@ -5635,7 +5635,7 @@ cl_int CL_API_CALL clEnqueueSVMMigrateMem(cl_command_queue commandQueue,
 
     if ((flags & (~allValidFlags)) != 0) {
         retVal = CL_INVALID_VALUE;
-        TRACING_EXIT(clEnqueueSVMMigrateMem, &retVal);
+        TRACING_EXIT(ClEnqueueSvmMigrateMem, &retVal);
         return retVal;
     }
 
@@ -5646,14 +5646,14 @@ cl_int CL_API_CALL clEnqueueSVMMigrateMem(cl_command_queue commandQueue,
         auto svmData = pSvmAllocMgr->getSVMAlloc(svmPointers[i]);
         if (svmData == nullptr) {
             retVal = CL_INVALID_VALUE;
-            TRACING_EXIT(clEnqueueSVMMigrateMem, &retVal);
+            TRACING_EXIT(ClEnqueueSvmMigrateMem, &retVal);
             return retVal;
         }
         if (sizes != nullptr && sizes[i] != 0) {
             svmData = pSvmAllocMgr->getSVMAlloc(reinterpret_cast<void *>((size_t)svmPointers[i] + sizes[i] - 1));
             if (svmData == nullptr) {
                 retVal = CL_INVALID_VALUE;
-                TRACING_EXIT(clEnqueueSVMMigrateMem, &retVal);
+                TRACING_EXIT(ClEnqueueSvmMigrateMem, &retVal);
                 return retVal;
             }
         }
@@ -5663,7 +5663,7 @@ cl_int CL_API_CALL clEnqueueSVMMigrateMem(cl_command_queue commandQueue,
         auto pEvent = castToObject<Event>(eventWaitList[i]);
         if (pEvent->getContext() != &pCommandQueue->getContext()) {
             retVal = CL_INVALID_CONTEXT;
-            TRACING_EXIT(clEnqueueSVMMigrateMem, &retVal);
+            TRACING_EXIT(ClEnqueueSvmMigrateMem, &retVal);
             return retVal;
         }
     }
@@ -5674,13 +5674,13 @@ cl_int CL_API_CALL clEnqueueSVMMigrateMem(cl_command_queue commandQueue,
                                                  numEventsInWaitList,
                                                  eventWaitList,
                                                  event);
-    TRACING_EXIT(clEnqueueSVMMigrateMem, &retVal);
+    TRACING_EXIT(ClEnqueueSvmMigrateMem, &retVal);
     return retVal;
 }
 
 cl_kernel CL_API_CALL clCloneKernel(cl_kernel sourceKernel,
                                     cl_int *errcodeRet) {
-    TRACING_ENTER(clCloneKernel, &sourceKernel, &errcodeRet);
+    TRACING_ENTER(ClCloneKernel, &sourceKernel, &errcodeRet);
     MultiDeviceKernel *pSourceMultiDeviceKernel = nullptr;
     MultiDeviceKernel *pClonedMultiDeviceKernel = nullptr;
 
@@ -5704,7 +5704,7 @@ cl_kernel CL_API_CALL clCloneKernel(cl_kernel sourceKernel,
         gtpinNotifyKernelCreate(pClonedMultiDeviceKernel);
     }
 
-    TRACING_EXIT(clCloneKernel, (cl_kernel *)&pClonedMultiDeviceKernel);
+    TRACING_EXIT(ClCloneKernel, (cl_kernel *)&pClonedMultiDeviceKernel);
     return pClonedMultiDeviceKernel;
 }
 
diff --git a/opencl/source/sharings/gl/windows/cl_gl_api.cpp b/opencl/source/sharings/gl/windows/cl_gl_api.cpp
index 5f15dc73d6..412c5f823b 100644
--- a/opencl/source/sharings/gl/windows/cl_gl_api.cpp
+++ b/opencl/source/sharings/gl/windows/cl_gl_api.cpp
@@ -35,7 +35,7 @@
 using namespace NEO;
 
 cl_mem CL_API_CALL clCreateFromGLBuffer(cl_context context, cl_mem_flags flags, cl_GLuint bufobj, cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateFromGLBuffer, &context, &flags, &bufobj, &errcodeRet);
+    TRACING_ENTER(ClCreateFromGlBuffer, &context, &flags, &bufobj, &errcodeRet);
 
     API_ENTER(errcodeRet);
     DBG_LOG_INPUTS("context", context, "flags", flags, "bufobj", bufobj);
@@ -48,25 +48,25 @@ cl_mem CL_API_CALL clCreateFromGLBuffer(cl_context context, cl_mem_flags flags,
 
     if (returnCode != CL_SUCCESS) {
         cl_mem buffer = nullptr;
-        TRACING_EXIT(clCreateFromGLBuffer, &buffer);
+        TRACING_EXIT(ClCreateFromGlBuffer, &buffer);
         return buffer;
     }
 
     if (pContext->getSharing<GLSharingFunctions>() == nullptr) {
         err.set(CL_INVALID_CONTEXT);
         cl_mem buffer = nullptr;
-        TRACING_EXIT(clCreateFromGLBuffer, &buffer);
+        TRACING_EXIT(ClCreateFromGlBuffer, &buffer);
         return buffer;
     }
 
     cl_mem buffer = GlBuffer::createSharedGlBuffer(pContext, flags, bufobj, errcodeRet);
-    TRACING_EXIT(clCreateFromGLBuffer, &buffer);
+    TRACING_EXIT(ClCreateFromGlBuffer, &buffer);
     return buffer;
 }
 
 cl_mem CL_API_CALL clCreateFromGLTexture(cl_context context, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel,
                                          cl_GLuint texture, cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateFromGLTexture, &context, &flags, &target, &miplevel, &texture, &errcodeRet);
+    TRACING_ENTER(ClCreateFromGlTexture, &context, &flags, &target, &miplevel, &texture, &errcodeRet);
 
     API_ENTER(errcodeRet);
     DBG_LOG_INPUTS("context", context, "flags", flags, "target", target, "miplevel", miplevel, "texture", texture);
@@ -78,25 +78,25 @@ cl_mem CL_API_CALL clCreateFromGLTexture(cl_context context, cl_mem_flags flags,
     cl_mem image = nullptr;
 
     if (returnCode != CL_SUCCESS) {
-        TRACING_EXIT(clCreateFromGLTexture, &image);
+        TRACING_EXIT(ClCreateFromGlTexture, &image);
         return image;
     }
 
     if (pContext->getSharing<GLSharingFunctions>() == nullptr) {
         err.set(CL_INVALID_CONTEXT);
-        TRACING_EXIT(clCreateFromGLTexture, &image);
+        TRACING_EXIT(ClCreateFromGlTexture, &image);
         return image;
     }
     image = GlTexture::createSharedGlTexture(pContext, flags, target, miplevel, texture, errcodeRet);
     DBG_LOG_INPUTS("image", image);
-    TRACING_EXIT(clCreateFromGLTexture, &image);
+    TRACING_EXIT(ClCreateFromGlTexture, &image);
     return image;
 }
 
 // deprecated OpenCL 1.1
 cl_mem CL_API_CALL clCreateFromGLTexture2D(cl_context context, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel,
                                            cl_GLuint texture, cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateFromGLTexture2D, &context, &flags, &target, &miplevel, &texture, &errcodeRet);
+    TRACING_ENTER(ClCreateFromGlTexture2D, &context, &flags, &target, &miplevel, &texture, &errcodeRet);
 
     API_ENTER(errcodeRet);
     DBG_LOG_INPUTS("context", context, "flags", flags, "target", target, "miplevel", miplevel, "texture", texture);
@@ -107,26 +107,26 @@ cl_mem CL_API_CALL clCreateFromGLTexture2D(cl_context context, cl_mem_flags flag
     cl_mem image = nullptr;
 
     if (returnCode != CL_SUCCESS) {
-        TRACING_EXIT(clCreateFromGLTexture2D, &image);
+        TRACING_EXIT(ClCreateFromGlTexture2D, &image);
         return image;
     }
 
     if (pContext->getSharing<GLSharingFunctions>() == nullptr) {
         err.set(CL_INVALID_CONTEXT);
-        TRACING_EXIT(clCreateFromGLTexture2D, &image);
+        TRACING_EXIT(ClCreateFromGlTexture2D, &image);
         return image;
     }
 
     image = GlTexture::createSharedGlTexture(pContext, flags, target, miplevel, texture, errcodeRet);
     DBG_LOG_INPUTS("image", image);
-    TRACING_EXIT(clCreateFromGLTexture2D, &image);
+    TRACING_EXIT(ClCreateFromGlTexture2D, &image);
     return image;
 }
 
 // deprecated OpenCL 1.1
 cl_mem CL_API_CALL clCreateFromGLTexture3D(cl_context context, cl_mem_flags flags, cl_GLenum target, cl_GLint miplevel,
                                            cl_GLuint texture, cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateFromGLTexture3D, &context, &flags, &target, &miplevel, &texture, &errcodeRet);
+    TRACING_ENTER(ClCreateFromGlTexture3D, &context, &flags, &target, &miplevel, &texture, &errcodeRet);
 
     API_ENTER(errcodeRet);
     DBG_LOG_INPUTS("context", context, "flags", flags, "target", target, "miplevel", miplevel, "texture", texture);
@@ -137,24 +137,24 @@ cl_mem CL_API_CALL clCreateFromGLTexture3D(cl_context context, cl_mem_flags flag
     cl_mem image = nullptr;
 
     if (returnCode != CL_SUCCESS) {
-        TRACING_EXIT(clCreateFromGLTexture3D, &image);
+        TRACING_EXIT(ClCreateFromGlTexture3D, &image);
         return image;
     }
 
     if (pContext->getSharing<GLSharingFunctions>() == nullptr) {
         err.set(CL_INVALID_CONTEXT);
-        TRACING_EXIT(clCreateFromGLTexture3D, &image);
+        TRACING_EXIT(ClCreateFromGlTexture3D, &image);
         return image;
     }
 
     image = GlTexture::createSharedGlTexture(pContext, flags, target, miplevel, texture, errcodeRet);
     DBG_LOG_INPUTS("image", image);
-    TRACING_EXIT(clCreateFromGLTexture3D, &image);
+    TRACING_EXIT(ClCreateFromGlTexture3D, &image);
     return image;
 }
 
 cl_mem CL_API_CALL clCreateFromGLRenderbuffer(cl_context context, cl_mem_flags flags, cl_GLuint renderbuffer, cl_int *errcodeRet) {
-    TRACING_ENTER(clCreateFromGLRenderbuffer, &context, &flags, &renderbuffer, &errcodeRet);
+    TRACING_ENTER(ClCreateFromGlRenderbuffer, &context, &flags, &renderbuffer, &errcodeRet);
 
     API_ENTER(errcodeRet);
     DBG_LOG_INPUTS("context", context, "flags", flags, "renderbuffer", renderbuffer);
@@ -165,24 +165,24 @@ cl_mem CL_API_CALL clCreateFromGLRenderbuffer(cl_context context, cl_mem_flags f
 
     if (returnCode != CL_SUCCESS) {
         cl_mem buffer = nullptr;
-        TRACING_EXIT(clCreateFromGLRenderbuffer, &buffer);
+        TRACING_EXIT(ClCreateFromGlRenderbuffer, &buffer);
         return buffer;
     }
 
     if (pContext->getSharing<GLSharingFunctions>() == nullptr) {
         err.set(CL_INVALID_CONTEXT);
         cl_mem buffer = nullptr;
-        TRACING_EXIT(clCreateFromGLRenderbuffer, &buffer);
+        TRACING_EXIT(ClCreateFromGlRenderbuffer, &buffer);
         return buffer;
     }
 
     cl_mem buffer = GlTexture::createSharedGlTexture(pContext, flags, GL_RENDERBUFFER_EXT, 0, renderbuffer, errcodeRet);
-    TRACING_EXIT(clCreateFromGLRenderbuffer, &buffer);
+    TRACING_EXIT(ClCreateFromGlRenderbuffer, &buffer);
     return buffer;
 }
 
 cl_int CL_API_CALL clGetGLObjectInfo(cl_mem memobj, cl_gl_object_type *glObjectType, cl_GLuint *glObjectName) {
-    TRACING_ENTER(clGetGLObjectInfo, &memobj, &glObjectType, &glObjectName);
+    TRACING_ENTER(ClGetGlObjectInfo, &memobj, &glObjectType, &glObjectName);
     cl_int retValue = CL_SUCCESS;
     API_ENTER(&retValue);
     DBG_LOG_INPUTS("memobj", memobj, "glObjectType", glObjectType, "glObjectName", glObjectName);
@@ -194,17 +194,17 @@ cl_int CL_API_CALL clGetGLObjectInfo(cl_mem memobj, cl_gl_object_type *glObjectT
             handler->getGlObjectInfo(glObjectType, glObjectName);
         } else {
             retValue = CL_INVALID_GL_OBJECT;
-            TRACING_EXIT(clGetGLObjectInfo, &retValue);
+            TRACING_EXIT(ClGetGlObjectInfo, &retValue);
             return retValue;
         }
     }
-    TRACING_EXIT(clGetGLObjectInfo, &retValue);
+    TRACING_EXIT(ClGetGlObjectInfo, &retValue);
     return retValue;
 }
 
 cl_int CL_API_CALL clGetGLTextureInfo(cl_mem memobj, cl_gl_texture_info paramName, size_t paramValueSize, void *paramValue,
                                       size_t *paramValueSizeRet) {
-    TRACING_ENTER(clGetGLTextureInfo, &memobj, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
+    TRACING_ENTER(ClGetGlTextureInfo, &memobj, &paramName, &paramValueSize, &paramValue, &paramValueSizeRet);
     cl_int retValue = CL_SUCCESS;
     API_ENTER(&retValue);
     DBG_LOG_INPUTS("memobj", memobj, "paramName", paramName, "paramValueSize", paramValueSize, "paramValueSize",
@@ -216,13 +216,13 @@ cl_int CL_API_CALL clGetGLTextureInfo(cl_mem memobj, cl_gl_texture_info paramNam
         auto glTexture = (GlTexture *)pMemObj->peekSharingHandler();
         retValue = glTexture->getGlTextureInfo(paramName, paramValueSize, paramValue, paramValueSizeRet);
     }
-    TRACING_EXIT(clGetGLTextureInfo, &retValue);
+    TRACING_EXIT(ClGetGlTextureInfo, &retValue);
     return retValue;
 }
 
 cl_int CL_API_CALL clEnqueueAcquireGLObjects(cl_command_queue commandQueue, cl_uint numObjects, const cl_mem *memObjects,
                                              cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event) {
-    TRACING_ENTER(clEnqueueAcquireGLObjects, &commandQueue, &numObjects, &memObjects, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueAcquireGlObjects, &commandQueue, &numObjects, &memObjects, &numEventsInWaitList, &eventWaitList, &event);
 
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
@@ -236,7 +236,7 @@ cl_int CL_API_CALL clEnqueueAcquireGLObjects(cl_command_queue commandQueue, cl_u
     if (retVal == CL_SUCCESS) {
         if (pCommandQueue->getContext().getSharing<GLSharingFunctions>() == nullptr) {
             retVal = CL_INVALID_CONTEXT;
-            TRACING_EXIT(clEnqueueAcquireGLObjects, &retVal);
+            TRACING_EXIT(ClEnqueueAcquireGlObjects, &retVal);
             return retVal;
         }
 
@@ -253,13 +253,13 @@ cl_int CL_API_CALL clEnqueueAcquireGLObjects(cl_command_queue commandQueue, cl_u
                                                             CL_COMMAND_ACQUIRE_GL_OBJECTS);
     }
 
-    TRACING_EXIT(clEnqueueAcquireGLObjects, &retVal);
+    TRACING_EXIT(ClEnqueueAcquireGlObjects, &retVal);
     return retVal;
 }
 
 cl_int CL_API_CALL clEnqueueReleaseGLObjects(cl_command_queue commandQueue, cl_uint numObjects, const cl_mem *memObjects,
                                              cl_uint numEventsInWaitList, const cl_event *eventWaitList, cl_event *event) {
-    TRACING_ENTER(clEnqueueReleaseGLObjects, &commandQueue, &numObjects, &memObjects, &numEventsInWaitList, &eventWaitList, &event);
+    TRACING_ENTER(ClEnqueueReleaseGlObjects, &commandQueue, &numObjects, &memObjects, &numEventsInWaitList, &eventWaitList, &event);
 
     cl_int retVal = CL_SUCCESS;
     API_ENTER(&retVal);
@@ -273,7 +273,7 @@ cl_int CL_API_CALL clEnqueueReleaseGLObjects(cl_command_queue commandQueue, cl_u
     if (retVal == CL_SUCCESS) {
         if (pCommandQueue->getContext().getSharing<GLSharingFunctions>() == nullptr) {
             retVal = CL_INVALID_CONTEXT;
-            TRACING_EXIT(clEnqueueReleaseGLObjects, &retVal);
+            TRACING_EXIT(ClEnqueueReleaseGlObjects, &retVal);
             return retVal;
         }
 
@@ -282,7 +282,7 @@ cl_int CL_API_CALL clEnqueueReleaseGLObjects(cl_command_queue commandQueue, cl_u
                                                             CL_COMMAND_RELEASE_GL_OBJECTS);
     }
 
-    TRACING_EXIT(clEnqueueReleaseGLObjects, &retVal);
+    TRACING_EXIT(ClEnqueueReleaseGlObjects, &retVal);
     return retVal;
 }
 
diff --git a/opencl/source/tracing/tracing_notify.h b/opencl/source/tracing/tracing_notify.h
index 354b7e74d2..59514e2e43 100644
--- a/opencl/source/tracing/tracing_notify.h
+++ b/opencl/source/tracing/tracing_notify.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2020 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -82,9 +82,9 @@ class AtomicBackoff {
     uint32_t count = 1;
 };
 
-class clBuildProgramTracer {
+class ClBuildProgramTracer {
   public:
-    clBuildProgramTracer() {}
+    ClBuildProgramTracer() {}
 
     void enter(cl_program *program,
                cl_uint *numDevices,
@@ -142,7 +142,7 @@ class clBuildProgramTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clBuildProgramTracer() {
+    ~ClBuildProgramTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -153,9 +153,9 @@ class clBuildProgramTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCloneKernelTracer {
+class ClCloneKernelTracer {
   public:
-    clCloneKernelTracer() {}
+    ClCloneKernelTracer() {}
 
     void enter(cl_kernel *sourceKernel,
                cl_int **errcodeRet) {
@@ -205,7 +205,7 @@ class clCloneKernelTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCloneKernelTracer() {
+    ~ClCloneKernelTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -216,9 +216,9 @@ class clCloneKernelTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCompileProgramTracer {
+class ClCompileProgramTracer {
   public:
-    clCompileProgramTracer() {}
+    ClCompileProgramTracer() {}
 
     void enter(cl_program *program,
                cl_uint *numDevices,
@@ -282,7 +282,7 @@ class clCompileProgramTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCompileProgramTracer() {
+    ~ClCompileProgramTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -293,9 +293,9 @@ class clCompileProgramTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateBufferTracer {
+class ClCreateBufferTracer {
   public:
-    clCreateBufferTracer() {}
+    ClCreateBufferTracer() {}
 
     void enter(cl_context *context,
                cl_mem_flags *flags,
@@ -351,7 +351,7 @@ class clCreateBufferTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateBufferTracer() {
+    ~ClCreateBufferTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -362,9 +362,9 @@ class clCreateBufferTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateCommandQueueTracer {
+class ClCreateCommandQueueTracer {
   public:
-    clCreateCommandQueueTracer() {}
+    ClCreateCommandQueueTracer() {}
 
     void enter(cl_context *context,
                cl_device_id *device,
@@ -418,7 +418,7 @@ class clCreateCommandQueueTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateCommandQueueTracer() {
+    ~ClCreateCommandQueueTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -429,9 +429,9 @@ class clCreateCommandQueueTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateCommandQueueWithPropertiesTracer {
+class ClCreateCommandQueueWithPropertiesTracer {
   public:
-    clCreateCommandQueueWithPropertiesTracer() {}
+    ClCreateCommandQueueWithPropertiesTracer() {}
 
     void enter(cl_context *context,
                cl_device_id *device,
@@ -485,7 +485,7 @@ class clCreateCommandQueueWithPropertiesTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateCommandQueueWithPropertiesTracer() {
+    ~ClCreateCommandQueueWithPropertiesTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -496,9 +496,9 @@ class clCreateCommandQueueWithPropertiesTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateContextTracer {
+class ClCreateContextTracer {
   public:
-    clCreateContextTracer() {}
+    ClCreateContextTracer() {}
 
     void enter(const cl_context_properties **properties,
                cl_uint *numDevices,
@@ -556,7 +556,7 @@ class clCreateContextTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateContextTracer() {
+    ~ClCreateContextTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -567,9 +567,9 @@ class clCreateContextTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateContextFromTypeTracer {
+class ClCreateContextFromTypeTracer {
   public:
-    clCreateContextFromTypeTracer() {}
+    ClCreateContextFromTypeTracer() {}
 
     void enter(const cl_context_properties **properties,
                cl_device_type *deviceType,
@@ -625,7 +625,7 @@ class clCreateContextFromTypeTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateContextFromTypeTracer() {
+    ~ClCreateContextFromTypeTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -636,9 +636,9 @@ class clCreateContextFromTypeTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateImageTracer {
+class ClCreateImageTracer {
   public:
-    clCreateImageTracer() {}
+    ClCreateImageTracer() {}
 
     void enter(cl_context *context,
                cl_mem_flags *flags,
@@ -696,7 +696,7 @@ class clCreateImageTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateImageTracer() {
+    ~ClCreateImageTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -707,9 +707,9 @@ class clCreateImageTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateImage2DTracer {
+class ClCreateImage2DTracer {
   public:
-    clCreateImage2DTracer() {}
+    ClCreateImage2DTracer() {}
 
     void enter(cl_context *context,
                cl_mem_flags *flags,
@@ -771,7 +771,7 @@ class clCreateImage2DTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateImage2DTracer() {
+    ~ClCreateImage2DTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -782,9 +782,9 @@ class clCreateImage2DTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateImage3DTracer {
+class ClCreateImage3DTracer {
   public:
-    clCreateImage3DTracer() {}
+    ClCreateImage3DTracer() {}
 
     void enter(cl_context *context,
                cl_mem_flags *flags,
@@ -850,7 +850,7 @@ class clCreateImage3DTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateImage3DTracer() {
+    ~ClCreateImage3DTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -861,9 +861,9 @@ class clCreateImage3DTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateKernelTracer {
+class ClCreateKernelTracer {
   public:
-    clCreateKernelTracer() {}
+    ClCreateKernelTracer() {}
 
     void enter(cl_program *program,
                const char **kernelName,
@@ -915,7 +915,7 @@ class clCreateKernelTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateKernelTracer() {
+    ~ClCreateKernelTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -926,9 +926,9 @@ class clCreateKernelTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateKernelsInProgramTracer {
+class ClCreateKernelsInProgramTracer {
   public:
-    clCreateKernelsInProgramTracer() {}
+    ClCreateKernelsInProgramTracer() {}
 
     void enter(cl_program *program,
                cl_uint *numKernels,
@@ -982,7 +982,7 @@ class clCreateKernelsInProgramTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateKernelsInProgramTracer() {
+    ~ClCreateKernelsInProgramTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -993,9 +993,9 @@ class clCreateKernelsInProgramTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreatePipeTracer {
+class ClCreatePipeTracer {
   public:
-    clCreatePipeTracer() {}
+    ClCreatePipeTracer() {}
 
     void enter(cl_context *context,
                cl_mem_flags *flags,
@@ -1053,7 +1053,7 @@ class clCreatePipeTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreatePipeTracer() {
+    ~ClCreatePipeTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -1064,9 +1064,9 @@ class clCreatePipeTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateProgramWithBinaryTracer {
+class ClCreateProgramWithBinaryTracer {
   public:
-    clCreateProgramWithBinaryTracer() {}
+    ClCreateProgramWithBinaryTracer() {}
 
     void enter(cl_context *context,
                cl_uint *numDevices,
@@ -1126,7 +1126,7 @@ class clCreateProgramWithBinaryTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateProgramWithBinaryTracer() {
+    ~ClCreateProgramWithBinaryTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -1137,9 +1137,9 @@ class clCreateProgramWithBinaryTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateProgramWithBuiltInKernelsTracer {
+class ClCreateProgramWithBuiltInKernelsTracer {
   public:
-    clCreateProgramWithBuiltInKernelsTracer() {}
+    ClCreateProgramWithBuiltInKernelsTracer() {}
 
     void enter(cl_context *context,
                cl_uint *numDevices,
@@ -1195,7 +1195,7 @@ class clCreateProgramWithBuiltInKernelsTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateProgramWithBuiltInKernelsTracer() {
+    ~ClCreateProgramWithBuiltInKernelsTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -1206,9 +1206,9 @@ class clCreateProgramWithBuiltInKernelsTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateProgramWithILTracer {
+class ClCreateProgramWithIlTracer {
   public:
-    clCreateProgramWithILTracer() {}
+    ClCreateProgramWithIlTracer() {}
 
     void enter(cl_context *context,
                const void **il,
@@ -1262,7 +1262,7 @@ class clCreateProgramWithILTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateProgramWithILTracer() {
+    ~ClCreateProgramWithIlTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -1273,9 +1273,9 @@ class clCreateProgramWithILTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateProgramWithSourceTracer {
+class ClCreateProgramWithSourceTracer {
   public:
-    clCreateProgramWithSourceTracer() {}
+    ClCreateProgramWithSourceTracer() {}
 
     void enter(cl_context *context,
                cl_uint *count,
@@ -1331,7 +1331,7 @@ class clCreateProgramWithSourceTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateProgramWithSourceTracer() {
+    ~ClCreateProgramWithSourceTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -1342,9 +1342,9 @@ class clCreateProgramWithSourceTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateSamplerTracer {
+class ClCreateSamplerTracer {
   public:
-    clCreateSamplerTracer() {}
+    ClCreateSamplerTracer() {}
 
     void enter(cl_context *context,
                cl_bool *normalizedCoords,
@@ -1400,7 +1400,7 @@ class clCreateSamplerTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateSamplerTracer() {
+    ~ClCreateSamplerTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -1411,9 +1411,9 @@ class clCreateSamplerTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateSamplerWithPropertiesTracer {
+class ClCreateSamplerWithPropertiesTracer {
   public:
-    clCreateSamplerWithPropertiesTracer() {}
+    ClCreateSamplerWithPropertiesTracer() {}
 
     void enter(cl_context *context,
                const cl_sampler_properties **samplerProperties,
@@ -1465,7 +1465,7 @@ class clCreateSamplerWithPropertiesTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateSamplerWithPropertiesTracer() {
+    ~ClCreateSamplerWithPropertiesTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -1476,9 +1476,9 @@ class clCreateSamplerWithPropertiesTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateSubBufferTracer {
+class ClCreateSubBufferTracer {
   public:
-    clCreateSubBufferTracer() {}
+    ClCreateSubBufferTracer() {}
 
     void enter(cl_mem *buffer,
                cl_mem_flags *flags,
@@ -1534,7 +1534,7 @@ class clCreateSubBufferTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateSubBufferTracer() {
+    ~ClCreateSubBufferTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -1545,9 +1545,9 @@ class clCreateSubBufferTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateUserEventTracer {
+class ClCreateUserEventTracer {
   public:
-    clCreateUserEventTracer() {}
+    ClCreateUserEventTracer() {}
 
     void enter(cl_context *context,
                cl_int **errcodeRet) {
@@ -1597,7 +1597,7 @@ class clCreateUserEventTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateUserEventTracer() {
+    ~ClCreateUserEventTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -1608,9 +1608,9 @@ class clCreateUserEventTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueBarrierTracer {
+class ClEnqueueBarrierTracer {
   public:
-    clEnqueueBarrierTracer() {}
+    ClEnqueueBarrierTracer() {}
 
     void enter(cl_command_queue *commandQueue) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -1658,7 +1658,7 @@ class clEnqueueBarrierTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueBarrierTracer() {
+    ~ClEnqueueBarrierTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -1669,9 +1669,9 @@ class clEnqueueBarrierTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueBarrierWithWaitListTracer {
+class ClEnqueueBarrierWithWaitListTracer {
   public:
-    clEnqueueBarrierWithWaitListTracer() {}
+    ClEnqueueBarrierWithWaitListTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_uint *numEventsInWaitList,
@@ -1725,7 +1725,7 @@ class clEnqueueBarrierWithWaitListTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueBarrierWithWaitListTracer() {
+    ~ClEnqueueBarrierWithWaitListTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -1736,9 +1736,9 @@ class clEnqueueBarrierWithWaitListTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueCopyBufferTracer {
+class ClEnqueueCopyBufferTracer {
   public:
-    clEnqueueCopyBufferTracer() {}
+    ClEnqueueCopyBufferTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *srcBuffer,
@@ -1802,7 +1802,7 @@ class clEnqueueCopyBufferTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueCopyBufferTracer() {
+    ~ClEnqueueCopyBufferTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -1813,9 +1813,9 @@ class clEnqueueCopyBufferTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueCopyBufferRectTracer {
+class ClEnqueueCopyBufferRectTracer {
   public:
-    clEnqueueCopyBufferRectTracer() {}
+    ClEnqueueCopyBufferRectTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *srcBuffer,
@@ -1887,7 +1887,7 @@ class clEnqueueCopyBufferRectTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueCopyBufferRectTracer() {
+    ~ClEnqueueCopyBufferRectTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -1898,9 +1898,9 @@ class clEnqueueCopyBufferRectTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueCopyBufferToImageTracer {
+class ClEnqueueCopyBufferToImageTracer {
   public:
-    clEnqueueCopyBufferToImageTracer() {}
+    ClEnqueueCopyBufferToImageTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *srcBuffer,
@@ -1964,7 +1964,7 @@ class clEnqueueCopyBufferToImageTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueCopyBufferToImageTracer() {
+    ~ClEnqueueCopyBufferToImageTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -1975,9 +1975,9 @@ class clEnqueueCopyBufferToImageTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueCopyImageTracer {
+class ClEnqueueCopyImageTracer {
   public:
-    clEnqueueCopyImageTracer() {}
+    ClEnqueueCopyImageTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *srcImage,
@@ -2041,7 +2041,7 @@ class clEnqueueCopyImageTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueCopyImageTracer() {
+    ~ClEnqueueCopyImageTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -2052,9 +2052,9 @@ class clEnqueueCopyImageTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueCopyImageToBufferTracer {
+class ClEnqueueCopyImageToBufferTracer {
   public:
-    clEnqueueCopyImageToBufferTracer() {}
+    ClEnqueueCopyImageToBufferTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *srcImage,
@@ -2118,7 +2118,7 @@ class clEnqueueCopyImageToBufferTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueCopyImageToBufferTracer() {
+    ~ClEnqueueCopyImageToBufferTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -2129,9 +2129,9 @@ class clEnqueueCopyImageToBufferTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueFillBufferTracer {
+class ClEnqueueFillBufferTracer {
   public:
-    clEnqueueFillBufferTracer() {}
+    ClEnqueueFillBufferTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *buffer,
@@ -2195,7 +2195,7 @@ class clEnqueueFillBufferTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueFillBufferTracer() {
+    ~ClEnqueueFillBufferTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -2206,9 +2206,9 @@ class clEnqueueFillBufferTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueFillImageTracer {
+class ClEnqueueFillImageTracer {
   public:
-    clEnqueueFillImageTracer() {}
+    ClEnqueueFillImageTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *image,
@@ -2270,7 +2270,7 @@ class clEnqueueFillImageTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueFillImageTracer() {
+    ~ClEnqueueFillImageTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -2281,9 +2281,9 @@ class clEnqueueFillImageTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueMapBufferTracer {
+class ClEnqueueMapBufferTracer {
   public:
-    clEnqueueMapBufferTracer() {}
+    ClEnqueueMapBufferTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *buffer,
@@ -2349,7 +2349,7 @@ class clEnqueueMapBufferTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueMapBufferTracer() {
+    ~ClEnqueueMapBufferTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -2360,9 +2360,9 @@ class clEnqueueMapBufferTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueMapImageTracer {
+class ClEnqueueMapImageTracer {
   public:
-    clEnqueueMapImageTracer() {}
+    ClEnqueueMapImageTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *image,
@@ -2432,7 +2432,7 @@ class clEnqueueMapImageTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueMapImageTracer() {
+    ~ClEnqueueMapImageTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -2443,9 +2443,9 @@ class clEnqueueMapImageTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueMarkerTracer {
+class ClEnqueueMarkerTracer {
   public:
-    clEnqueueMarkerTracer() {}
+    ClEnqueueMarkerTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_event **event) {
@@ -2495,7 +2495,7 @@ class clEnqueueMarkerTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueMarkerTracer() {
+    ~ClEnqueueMarkerTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -2506,9 +2506,9 @@ class clEnqueueMarkerTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueMarkerWithWaitListTracer {
+class ClEnqueueMarkerWithWaitListTracer {
   public:
-    clEnqueueMarkerWithWaitListTracer() {}
+    ClEnqueueMarkerWithWaitListTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_uint *numEventsInWaitList,
@@ -2562,7 +2562,7 @@ class clEnqueueMarkerWithWaitListTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueMarkerWithWaitListTracer() {
+    ~ClEnqueueMarkerWithWaitListTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -2573,9 +2573,9 @@ class clEnqueueMarkerWithWaitListTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueMigrateMemObjectsTracer {
+class ClEnqueueMigrateMemObjectsTracer {
   public:
-    clEnqueueMigrateMemObjectsTracer() {}
+    ClEnqueueMigrateMemObjectsTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_uint *numMemObjects,
@@ -2635,7 +2635,7 @@ class clEnqueueMigrateMemObjectsTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueMigrateMemObjectsTracer() {
+    ~ClEnqueueMigrateMemObjectsTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -2646,9 +2646,9 @@ class clEnqueueMigrateMemObjectsTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueNDRangeKernelTracer {
+class ClEnqueueNdRangeKernelTracer {
   public:
-    clEnqueueNDRangeKernelTracer() {}
+    ClEnqueueNdRangeKernelTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_kernel *kernel,
@@ -2712,7 +2712,7 @@ class clEnqueueNDRangeKernelTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueNDRangeKernelTracer() {
+    ~ClEnqueueNdRangeKernelTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -2723,9 +2723,9 @@ class clEnqueueNDRangeKernelTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueNativeKernelTracer {
+class ClEnqueueNativeKernelTracer {
   public:
-    clEnqueueNativeKernelTracer() {}
+    ClEnqueueNativeKernelTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                void(CL_CALLBACK **userFunc)(void *),
@@ -2791,7 +2791,7 @@ class clEnqueueNativeKernelTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueNativeKernelTracer() {
+    ~ClEnqueueNativeKernelTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -2802,9 +2802,9 @@ class clEnqueueNativeKernelTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueReadBufferTracer {
+class ClEnqueueReadBufferTracer {
   public:
-    clEnqueueReadBufferTracer() {}
+    ClEnqueueReadBufferTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *buffer,
@@ -2868,7 +2868,7 @@ class clEnqueueReadBufferTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueReadBufferTracer() {
+    ~ClEnqueueReadBufferTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -2879,9 +2879,9 @@ class clEnqueueReadBufferTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueReadBufferRectTracer {
+class ClEnqueueReadBufferRectTracer {
   public:
-    clEnqueueReadBufferRectTracer() {}
+    ClEnqueueReadBufferRectTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *buffer,
@@ -2955,7 +2955,7 @@ class clEnqueueReadBufferRectTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueReadBufferRectTracer() {
+    ~ClEnqueueReadBufferRectTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -2966,9 +2966,9 @@ class clEnqueueReadBufferRectTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueReadImageTracer {
+class ClEnqueueReadImageTracer {
   public:
-    clEnqueueReadImageTracer() {}
+    ClEnqueueReadImageTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *image,
@@ -3036,7 +3036,7 @@ class clEnqueueReadImageTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueReadImageTracer() {
+    ~ClEnqueueReadImageTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -3047,9 +3047,9 @@ class clEnqueueReadImageTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueSVMFreeTracer {
+class ClEnqueueSvmFreeTracer {
   public:
-    clEnqueueSVMFreeTracer() {}
+    ClEnqueueSvmFreeTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_uint *numSvmPointers,
@@ -3111,7 +3111,7 @@ class clEnqueueSVMFreeTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueSVMFreeTracer() {
+    ~ClEnqueueSvmFreeTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -3122,9 +3122,9 @@ class clEnqueueSVMFreeTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueSVMMapTracer {
+class ClEnqueueSvmMapTracer {
   public:
-    clEnqueueSVMMapTracer() {}
+    ClEnqueueSvmMapTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_bool *blockingMap,
@@ -3186,7 +3186,7 @@ class clEnqueueSVMMapTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueSVMMapTracer() {
+    ~ClEnqueueSvmMapTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -3197,9 +3197,9 @@ class clEnqueueSVMMapTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueSVMMemFillTracer {
+class ClEnqueueSvmMemFillTracer {
   public:
-    clEnqueueSVMMemFillTracer() {}
+    ClEnqueueSvmMemFillTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                void **svmPtr,
@@ -3261,7 +3261,7 @@ class clEnqueueSVMMemFillTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueSVMMemFillTracer() {
+    ~ClEnqueueSvmMemFillTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -3272,9 +3272,9 @@ class clEnqueueSVMMemFillTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueSVMMemcpyTracer {
+class ClEnqueueSvmMemcpyTracer {
   public:
-    clEnqueueSVMMemcpyTracer() {}
+    ClEnqueueSvmMemcpyTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_bool *blockingCopy,
@@ -3336,7 +3336,7 @@ class clEnqueueSVMMemcpyTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueSVMMemcpyTracer() {
+    ~ClEnqueueSvmMemcpyTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -3347,9 +3347,9 @@ class clEnqueueSVMMemcpyTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueSVMMigrateMemTracer {
+class ClEnqueueSvmMigrateMemTracer {
   public:
-    clEnqueueSVMMigrateMemTracer() {}
+    ClEnqueueSvmMigrateMemTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_uint *numSvmPointers,
@@ -3411,7 +3411,7 @@ class clEnqueueSVMMigrateMemTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueSVMMigrateMemTracer() {
+    ~ClEnqueueSvmMigrateMemTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -3422,9 +3422,9 @@ class clEnqueueSVMMigrateMemTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueSVMUnmapTracer {
+class ClEnqueueSvmUnmapTracer {
   public:
-    clEnqueueSVMUnmapTracer() {}
+    ClEnqueueSvmUnmapTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                void **svmPtr,
@@ -3480,7 +3480,7 @@ class clEnqueueSVMUnmapTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueSVMUnmapTracer() {
+    ~ClEnqueueSvmUnmapTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -3491,9 +3491,9 @@ class clEnqueueSVMUnmapTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueTaskTracer {
+class ClEnqueueTaskTracer {
   public:
-    clEnqueueTaskTracer() {}
+    ClEnqueueTaskTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_kernel *kernel,
@@ -3549,7 +3549,7 @@ class clEnqueueTaskTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueTaskTracer() {
+    ~ClEnqueueTaskTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -3560,9 +3560,9 @@ class clEnqueueTaskTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueUnmapMemObjectTracer {
+class ClEnqueueUnmapMemObjectTracer {
   public:
-    clEnqueueUnmapMemObjectTracer() {}
+    ClEnqueueUnmapMemObjectTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *memobj,
@@ -3620,7 +3620,7 @@ class clEnqueueUnmapMemObjectTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueUnmapMemObjectTracer() {
+    ~ClEnqueueUnmapMemObjectTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -3631,9 +3631,9 @@ class clEnqueueUnmapMemObjectTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueWaitForEventsTracer {
+class ClEnqueueWaitForEventsTracer {
   public:
-    clEnqueueWaitForEventsTracer() {}
+    ClEnqueueWaitForEventsTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_uint *numEvents,
@@ -3685,7 +3685,7 @@ class clEnqueueWaitForEventsTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueWaitForEventsTracer() {
+    ~ClEnqueueWaitForEventsTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -3696,9 +3696,9 @@ class clEnqueueWaitForEventsTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueWriteBufferTracer {
+class ClEnqueueWriteBufferTracer {
   public:
-    clEnqueueWriteBufferTracer() {}
+    ClEnqueueWriteBufferTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *buffer,
@@ -3762,7 +3762,7 @@ class clEnqueueWriteBufferTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueWriteBufferTracer() {
+    ~ClEnqueueWriteBufferTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -3773,9 +3773,9 @@ class clEnqueueWriteBufferTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueWriteBufferRectTracer {
+class ClEnqueueWriteBufferRectTracer {
   public:
-    clEnqueueWriteBufferRectTracer() {}
+    ClEnqueueWriteBufferRectTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *buffer,
@@ -3849,7 +3849,7 @@ class clEnqueueWriteBufferRectTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueWriteBufferRectTracer() {
+    ~ClEnqueueWriteBufferRectTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -3860,9 +3860,9 @@ class clEnqueueWriteBufferRectTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueWriteImageTracer {
+class ClEnqueueWriteImageTracer {
   public:
-    clEnqueueWriteImageTracer() {}
+    ClEnqueueWriteImageTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_mem *image,
@@ -3930,7 +3930,7 @@ class clEnqueueWriteImageTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueWriteImageTracer() {
+    ~ClEnqueueWriteImageTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -3941,9 +3941,9 @@ class clEnqueueWriteImageTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clFinishTracer {
+class ClFinishTracer {
   public:
-    clFinishTracer() {}
+    ClFinishTracer() {}
 
     void enter(cl_command_queue *commandQueue) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -3991,7 +3991,7 @@ class clFinishTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clFinishTracer() {
+    ~ClFinishTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4002,9 +4002,9 @@ class clFinishTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clFlushTracer {
+class ClFlushTracer {
   public:
-    clFlushTracer() {}
+    ClFlushTracer() {}
 
     void enter(cl_command_queue *commandQueue) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -4052,7 +4052,7 @@ class clFlushTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clFlushTracer() {
+    ~ClFlushTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4063,9 +4063,9 @@ class clFlushTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetCommandQueueInfoTracer {
+class ClGetCommandQueueInfoTracer {
   public:
-    clGetCommandQueueInfoTracer() {}
+    ClGetCommandQueueInfoTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_command_queue_info *paramName,
@@ -4121,7 +4121,7 @@ class clGetCommandQueueInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetCommandQueueInfoTracer() {
+    ~ClGetCommandQueueInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4132,9 +4132,9 @@ class clGetCommandQueueInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetContextInfoTracer {
+class ClGetContextInfoTracer {
   public:
-    clGetContextInfoTracer() {}
+    ClGetContextInfoTracer() {}
 
     void enter(cl_context *context,
                cl_context_info *paramName,
@@ -4190,7 +4190,7 @@ class clGetContextInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetContextInfoTracer() {
+    ~ClGetContextInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4201,9 +4201,9 @@ class clGetContextInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetDeviceAndHostTimerTracer {
+class ClGetDeviceAndHostTimerTracer {
   public:
-    clGetDeviceAndHostTimerTracer() {}
+    ClGetDeviceAndHostTimerTracer() {}
 
     void enter(cl_device_id *device,
                cl_ulong **deviceTimestamp,
@@ -4255,7 +4255,7 @@ class clGetDeviceAndHostTimerTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetDeviceAndHostTimerTracer() {
+    ~ClGetDeviceAndHostTimerTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4266,9 +4266,9 @@ class clGetDeviceAndHostTimerTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetDeviceIDsTracer {
+class ClGetDeviceIDsTracer {
   public:
-    clGetDeviceIDsTracer() {}
+    ClGetDeviceIDsTracer() {}
 
     void enter(cl_platform_id *platform,
                cl_device_type *deviceType,
@@ -4324,7 +4324,7 @@ class clGetDeviceIDsTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetDeviceIDsTracer() {
+    ~ClGetDeviceIDsTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4335,9 +4335,9 @@ class clGetDeviceIDsTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetDeviceInfoTracer {
+class ClGetDeviceInfoTracer {
   public:
-    clGetDeviceInfoTracer() {}
+    ClGetDeviceInfoTracer() {}
 
     void enter(cl_device_id *device,
                cl_device_info *paramName,
@@ -4393,7 +4393,7 @@ class clGetDeviceInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetDeviceInfoTracer() {
+    ~ClGetDeviceInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4404,9 +4404,9 @@ class clGetDeviceInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetEventInfoTracer {
+class ClGetEventInfoTracer {
   public:
-    clGetEventInfoTracer() {}
+    ClGetEventInfoTracer() {}
 
     void enter(cl_event *event,
                cl_event_info *paramName,
@@ -4462,7 +4462,7 @@ class clGetEventInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetEventInfoTracer() {
+    ~ClGetEventInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4473,9 +4473,9 @@ class clGetEventInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetEventProfilingInfoTracer {
+class ClGetEventProfilingInfoTracer {
   public:
-    clGetEventProfilingInfoTracer() {}
+    ClGetEventProfilingInfoTracer() {}
 
     void enter(cl_event *event,
                cl_profiling_info *paramName,
@@ -4531,7 +4531,7 @@ class clGetEventProfilingInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetEventProfilingInfoTracer() {
+    ~ClGetEventProfilingInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4542,9 +4542,9 @@ class clGetEventProfilingInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetExtensionFunctionAddressTracer {
+class ClGetExtensionFunctionAddressTracer {
   public:
-    clGetExtensionFunctionAddressTracer() {}
+    ClGetExtensionFunctionAddressTracer() {}
 
     void enter(const char **funcName) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -4592,7 +4592,7 @@ class clGetExtensionFunctionAddressTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetExtensionFunctionAddressTracer() {
+    ~ClGetExtensionFunctionAddressTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4603,9 +4603,9 @@ class clGetExtensionFunctionAddressTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetExtensionFunctionAddressForPlatformTracer {
+class ClGetExtensionFunctionAddressForPlatformTracer {
   public:
-    clGetExtensionFunctionAddressForPlatformTracer() {}
+    ClGetExtensionFunctionAddressForPlatformTracer() {}
 
     void enter(cl_platform_id *platform,
                const char **funcName) {
@@ -4655,7 +4655,7 @@ class clGetExtensionFunctionAddressForPlatformTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetExtensionFunctionAddressForPlatformTracer() {
+    ~ClGetExtensionFunctionAddressForPlatformTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4666,9 +4666,9 @@ class clGetExtensionFunctionAddressForPlatformTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetHostTimerTracer {
+class ClGetHostTimerTracer {
   public:
-    clGetHostTimerTracer() {}
+    ClGetHostTimerTracer() {}
 
     void enter(cl_device_id *device,
                cl_ulong **hostTimestamp) {
@@ -4718,7 +4718,7 @@ class clGetHostTimerTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetHostTimerTracer() {
+    ~ClGetHostTimerTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4729,9 +4729,9 @@ class clGetHostTimerTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetImageInfoTracer {
+class ClGetImageInfoTracer {
   public:
-    clGetImageInfoTracer() {}
+    ClGetImageInfoTracer() {}
 
     void enter(cl_mem *image,
                cl_image_info *paramName,
@@ -4787,7 +4787,7 @@ class clGetImageInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetImageInfoTracer() {
+    ~ClGetImageInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4798,9 +4798,9 @@ class clGetImageInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetKernelArgInfoTracer {
+class ClGetKernelArgInfoTracer {
   public:
-    clGetKernelArgInfoTracer() {}
+    ClGetKernelArgInfoTracer() {}
 
     void enter(cl_kernel *kernel,
                cl_uint *argIndx,
@@ -4858,7 +4858,7 @@ class clGetKernelArgInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetKernelArgInfoTracer() {
+    ~ClGetKernelArgInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4869,9 +4869,9 @@ class clGetKernelArgInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetKernelInfoTracer {
+class ClGetKernelInfoTracer {
   public:
-    clGetKernelInfoTracer() {}
+    ClGetKernelInfoTracer() {}
 
     void enter(cl_kernel *kernel,
                cl_kernel_info *paramName,
@@ -4927,7 +4927,7 @@ class clGetKernelInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetKernelInfoTracer() {
+    ~ClGetKernelInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -4938,9 +4938,9 @@ class clGetKernelInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetKernelSubGroupInfoTracer {
+class ClGetKernelSubGroupInfoTracer {
   public:
-    clGetKernelSubGroupInfoTracer() {}
+    ClGetKernelSubGroupInfoTracer() {}
 
     void enter(cl_kernel *kernel,
                cl_device_id *device,
@@ -5002,7 +5002,7 @@ class clGetKernelSubGroupInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetKernelSubGroupInfoTracer() {
+    ~ClGetKernelSubGroupInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5013,9 +5013,9 @@ class clGetKernelSubGroupInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetKernelWorkGroupInfoTracer {
+class ClGetKernelWorkGroupInfoTracer {
   public:
-    clGetKernelWorkGroupInfoTracer() {}
+    ClGetKernelWorkGroupInfoTracer() {}
 
     void enter(cl_kernel *kernel,
                cl_device_id *device,
@@ -5073,7 +5073,7 @@ class clGetKernelWorkGroupInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetKernelWorkGroupInfoTracer() {
+    ~ClGetKernelWorkGroupInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5084,9 +5084,9 @@ class clGetKernelWorkGroupInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetMemObjectInfoTracer {
+class ClGetMemObjectInfoTracer {
   public:
-    clGetMemObjectInfoTracer() {}
+    ClGetMemObjectInfoTracer() {}
 
     void enter(cl_mem *memobj,
                cl_mem_info *paramName,
@@ -5142,7 +5142,7 @@ class clGetMemObjectInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetMemObjectInfoTracer() {
+    ~ClGetMemObjectInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5153,9 +5153,9 @@ class clGetMemObjectInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetPipeInfoTracer {
+class ClGetPipeInfoTracer {
   public:
-    clGetPipeInfoTracer() {}
+    ClGetPipeInfoTracer() {}
 
     void enter(cl_mem *pipe,
                cl_pipe_info *paramName,
@@ -5211,7 +5211,7 @@ class clGetPipeInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetPipeInfoTracer() {
+    ~ClGetPipeInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5222,9 +5222,9 @@ class clGetPipeInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetPlatformIDsTracer {
+class ClGetPlatformIDsTracer {
   public:
-    clGetPlatformIDsTracer() {}
+    ClGetPlatformIDsTracer() {}
 
     void enter(cl_uint *numEntries,
                cl_platform_id **platforms,
@@ -5276,7 +5276,7 @@ class clGetPlatformIDsTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetPlatformIDsTracer() {
+    ~ClGetPlatformIDsTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5287,9 +5287,9 @@ class clGetPlatformIDsTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetPlatformInfoTracer {
+class ClGetPlatformInfoTracer {
   public:
-    clGetPlatformInfoTracer() {}
+    ClGetPlatformInfoTracer() {}
 
     void enter(cl_platform_id *platform,
                cl_platform_info *paramName,
@@ -5345,7 +5345,7 @@ class clGetPlatformInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetPlatformInfoTracer() {
+    ~ClGetPlatformInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5356,9 +5356,9 @@ class clGetPlatformInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetProgramBuildInfoTracer {
+class ClGetProgramBuildInfoTracer {
   public:
-    clGetProgramBuildInfoTracer() {}
+    ClGetProgramBuildInfoTracer() {}
 
     void enter(cl_program *program,
                cl_device_id *device,
@@ -5416,7 +5416,7 @@ class clGetProgramBuildInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetProgramBuildInfoTracer() {
+    ~ClGetProgramBuildInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5427,9 +5427,9 @@ class clGetProgramBuildInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetProgramInfoTracer {
+class ClGetProgramInfoTracer {
   public:
-    clGetProgramInfoTracer() {}
+    ClGetProgramInfoTracer() {}
 
     void enter(cl_program *program,
                cl_program_info *paramName,
@@ -5485,7 +5485,7 @@ class clGetProgramInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetProgramInfoTracer() {
+    ~ClGetProgramInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5496,9 +5496,9 @@ class clGetProgramInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetSamplerInfoTracer {
+class ClGetSamplerInfoTracer {
   public:
-    clGetSamplerInfoTracer() {}
+    ClGetSamplerInfoTracer() {}
 
     void enter(cl_sampler *sampler,
                cl_sampler_info *paramName,
@@ -5554,7 +5554,7 @@ class clGetSamplerInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetSamplerInfoTracer() {
+    ~ClGetSamplerInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5565,9 +5565,9 @@ class clGetSamplerInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetSupportedImageFormatsTracer {
+class ClGetSupportedImageFormatsTracer {
   public:
-    clGetSupportedImageFormatsTracer() {}
+    ClGetSupportedImageFormatsTracer() {}
 
     void enter(cl_context *context,
                cl_mem_flags *flags,
@@ -5625,7 +5625,7 @@ class clGetSupportedImageFormatsTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetSupportedImageFormatsTracer() {
+    ~ClGetSupportedImageFormatsTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5636,9 +5636,9 @@ class clGetSupportedImageFormatsTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clLinkProgramTracer {
+class ClLinkProgramTracer {
   public:
-    clLinkProgramTracer() {}
+    ClLinkProgramTracer() {}
 
     void enter(cl_context *context,
                cl_uint *numDevices,
@@ -5702,7 +5702,7 @@ class clLinkProgramTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clLinkProgramTracer() {
+    ~ClLinkProgramTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5713,9 +5713,9 @@ class clLinkProgramTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clReleaseCommandQueueTracer {
+class ClReleaseCommandQueueTracer {
   public:
-    clReleaseCommandQueueTracer() {}
+    ClReleaseCommandQueueTracer() {}
 
     void enter(cl_command_queue *commandQueue) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -5763,7 +5763,7 @@ class clReleaseCommandQueueTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clReleaseCommandQueueTracer() {
+    ~ClReleaseCommandQueueTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5774,9 +5774,9 @@ class clReleaseCommandQueueTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clReleaseContextTracer {
+class ClReleaseContextTracer {
   public:
-    clReleaseContextTracer() {}
+    ClReleaseContextTracer() {}
 
     void enter(cl_context *context) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -5824,7 +5824,7 @@ class clReleaseContextTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clReleaseContextTracer() {
+    ~ClReleaseContextTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5835,9 +5835,9 @@ class clReleaseContextTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clReleaseDeviceTracer {
+class ClReleaseDeviceTracer {
   public:
-    clReleaseDeviceTracer() {}
+    ClReleaseDeviceTracer() {}
 
     void enter(cl_device_id *device) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -5885,7 +5885,7 @@ class clReleaseDeviceTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clReleaseDeviceTracer() {
+    ~ClReleaseDeviceTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5896,9 +5896,9 @@ class clReleaseDeviceTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clReleaseEventTracer {
+class ClReleaseEventTracer {
   public:
-    clReleaseEventTracer() {}
+    ClReleaseEventTracer() {}
 
     void enter(cl_event *event) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -5946,7 +5946,7 @@ class clReleaseEventTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clReleaseEventTracer() {
+    ~ClReleaseEventTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -5957,9 +5957,9 @@ class clReleaseEventTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clReleaseKernelTracer {
+class ClReleaseKernelTracer {
   public:
-    clReleaseKernelTracer() {}
+    ClReleaseKernelTracer() {}
 
     void enter(cl_kernel *kernel) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -6007,7 +6007,7 @@ class clReleaseKernelTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clReleaseKernelTracer() {
+    ~ClReleaseKernelTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6018,9 +6018,9 @@ class clReleaseKernelTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clReleaseMemObjectTracer {
+class ClReleaseMemObjectTracer {
   public:
-    clReleaseMemObjectTracer() {}
+    ClReleaseMemObjectTracer() {}
 
     void enter(cl_mem *memobj) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -6068,7 +6068,7 @@ class clReleaseMemObjectTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clReleaseMemObjectTracer() {
+    ~ClReleaseMemObjectTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6079,9 +6079,9 @@ class clReleaseMemObjectTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clReleaseProgramTracer {
+class ClReleaseProgramTracer {
   public:
-    clReleaseProgramTracer() {}
+    ClReleaseProgramTracer() {}
 
     void enter(cl_program *program) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -6129,7 +6129,7 @@ class clReleaseProgramTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clReleaseProgramTracer() {
+    ~ClReleaseProgramTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6140,9 +6140,9 @@ class clReleaseProgramTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clReleaseSamplerTracer {
+class ClReleaseSamplerTracer {
   public:
-    clReleaseSamplerTracer() {}
+    ClReleaseSamplerTracer() {}
 
     void enter(cl_sampler *sampler) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -6190,7 +6190,7 @@ class clReleaseSamplerTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clReleaseSamplerTracer() {
+    ~ClReleaseSamplerTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6201,9 +6201,9 @@ class clReleaseSamplerTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clRetainCommandQueueTracer {
+class ClRetainCommandQueueTracer {
   public:
-    clRetainCommandQueueTracer() {}
+    ClRetainCommandQueueTracer() {}
 
     void enter(cl_command_queue *commandQueue) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -6251,7 +6251,7 @@ class clRetainCommandQueueTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clRetainCommandQueueTracer() {
+    ~ClRetainCommandQueueTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6262,9 +6262,9 @@ class clRetainCommandQueueTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clRetainContextTracer {
+class ClRetainContextTracer {
   public:
-    clRetainContextTracer() {}
+    ClRetainContextTracer() {}
 
     void enter(cl_context *context) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -6312,7 +6312,7 @@ class clRetainContextTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clRetainContextTracer() {
+    ~ClRetainContextTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6323,9 +6323,9 @@ class clRetainContextTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clRetainDeviceTracer {
+class ClRetainDeviceTracer {
   public:
-    clRetainDeviceTracer() {}
+    ClRetainDeviceTracer() {}
 
     void enter(cl_device_id *device) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -6373,7 +6373,7 @@ class clRetainDeviceTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clRetainDeviceTracer() {
+    ~ClRetainDeviceTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6384,9 +6384,9 @@ class clRetainDeviceTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clRetainEventTracer {
+class ClRetainEventTracer {
   public:
-    clRetainEventTracer() {}
+    ClRetainEventTracer() {}
 
     void enter(cl_event *event) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -6434,7 +6434,7 @@ class clRetainEventTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clRetainEventTracer() {
+    ~ClRetainEventTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6445,9 +6445,9 @@ class clRetainEventTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clRetainKernelTracer {
+class ClRetainKernelTracer {
   public:
-    clRetainKernelTracer() {}
+    ClRetainKernelTracer() {}
 
     void enter(cl_kernel *kernel) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -6495,7 +6495,7 @@ class clRetainKernelTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clRetainKernelTracer() {
+    ~ClRetainKernelTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6506,9 +6506,9 @@ class clRetainKernelTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clRetainMemObjectTracer {
+class ClRetainMemObjectTracer {
   public:
-    clRetainMemObjectTracer() {}
+    ClRetainMemObjectTracer() {}
 
     void enter(cl_mem *memobj) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -6556,7 +6556,7 @@ class clRetainMemObjectTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clRetainMemObjectTracer() {
+    ~ClRetainMemObjectTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6567,9 +6567,9 @@ class clRetainMemObjectTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clRetainProgramTracer {
+class ClRetainProgramTracer {
   public:
-    clRetainProgramTracer() {}
+    ClRetainProgramTracer() {}
 
     void enter(cl_program *program) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -6617,7 +6617,7 @@ class clRetainProgramTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clRetainProgramTracer() {
+    ~ClRetainProgramTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6628,9 +6628,9 @@ class clRetainProgramTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clRetainSamplerTracer {
+class ClRetainSamplerTracer {
   public:
-    clRetainSamplerTracer() {}
+    ClRetainSamplerTracer() {}
 
     void enter(cl_sampler *sampler) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -6678,7 +6678,7 @@ class clRetainSamplerTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clRetainSamplerTracer() {
+    ~ClRetainSamplerTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6689,9 +6689,9 @@ class clRetainSamplerTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clSVMAllocTracer {
+class ClSvmAllocTracer {
   public:
-    clSVMAllocTracer() {}
+    ClSvmAllocTracer() {}
 
     void enter(cl_context *context,
                cl_svm_mem_flags *flags,
@@ -6745,7 +6745,7 @@ class clSVMAllocTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clSVMAllocTracer() {
+    ~ClSvmAllocTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6756,9 +6756,9 @@ class clSVMAllocTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clSVMFreeTracer {
+class ClSvmFreeTracer {
   public:
-    clSVMFreeTracer() {}
+    ClSvmFreeTracer() {}
 
     void enter(cl_context *context,
                void **svmPointer) {
@@ -6808,7 +6808,7 @@ class clSVMFreeTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clSVMFreeTracer() {
+    ~ClSvmFreeTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6819,9 +6819,9 @@ class clSVMFreeTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clSetCommandQueuePropertyTracer {
+class ClSetCommandQueuePropertyTracer {
   public:
-    clSetCommandQueuePropertyTracer() {}
+    ClSetCommandQueuePropertyTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_command_queue_properties *properties,
@@ -6875,7 +6875,7 @@ class clSetCommandQueuePropertyTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clSetCommandQueuePropertyTracer() {
+    ~ClSetCommandQueuePropertyTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6886,9 +6886,9 @@ class clSetCommandQueuePropertyTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clSetDefaultDeviceCommandQueueTracer {
+class ClSetDefaultDeviceCommandQueueTracer {
   public:
-    clSetDefaultDeviceCommandQueueTracer() {}
+    ClSetDefaultDeviceCommandQueueTracer() {}
 
     void enter(cl_context *context,
                cl_device_id *device,
@@ -6940,7 +6940,7 @@ class clSetDefaultDeviceCommandQueueTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clSetDefaultDeviceCommandQueueTracer() {
+    ~ClSetDefaultDeviceCommandQueueTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -6951,9 +6951,9 @@ class clSetDefaultDeviceCommandQueueTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clSetEventCallbackTracer {
+class ClSetEventCallbackTracer {
   public:
-    clSetEventCallbackTracer() {}
+    ClSetEventCallbackTracer() {}
 
     void enter(cl_event *event,
                cl_int *commandExecCallbackType,
@@ -7007,7 +7007,7 @@ class clSetEventCallbackTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clSetEventCallbackTracer() {
+    ~ClSetEventCallbackTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7018,9 +7018,9 @@ class clSetEventCallbackTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clSetKernelArgTracer {
+class ClSetKernelArgTracer {
   public:
-    clSetKernelArgTracer() {}
+    ClSetKernelArgTracer() {}
 
     void enter(cl_kernel *kernel,
                cl_uint *argIndex,
@@ -7074,7 +7074,7 @@ class clSetKernelArgTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clSetKernelArgTracer() {
+    ~ClSetKernelArgTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7085,9 +7085,9 @@ class clSetKernelArgTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clSetKernelArgSVMPointerTracer {
+class ClSetKernelArgSvmPointerTracer {
   public:
-    clSetKernelArgSVMPointerTracer() {}
+    ClSetKernelArgSvmPointerTracer() {}
 
     void enter(cl_kernel *kernel,
                cl_uint *argIndex,
@@ -7139,7 +7139,7 @@ class clSetKernelArgSVMPointerTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clSetKernelArgSVMPointerTracer() {
+    ~ClSetKernelArgSvmPointerTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7150,9 +7150,9 @@ class clSetKernelArgSVMPointerTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clSetKernelExecInfoTracer {
+class ClSetKernelExecInfoTracer {
   public:
-    clSetKernelExecInfoTracer() {}
+    ClSetKernelExecInfoTracer() {}
 
     void enter(cl_kernel *kernel,
                cl_kernel_exec_info *paramName,
@@ -7206,7 +7206,7 @@ class clSetKernelExecInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clSetKernelExecInfoTracer() {
+    ~ClSetKernelExecInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7217,9 +7217,9 @@ class clSetKernelExecInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clSetMemObjectDestructorCallbackTracer {
+class ClSetMemObjectDestructorCallbackTracer {
   public:
-    clSetMemObjectDestructorCallbackTracer() {}
+    ClSetMemObjectDestructorCallbackTracer() {}
 
     void enter(cl_mem *memobj,
                void(CL_CALLBACK **funcNotify)(cl_mem, void *),
@@ -7271,7 +7271,7 @@ class clSetMemObjectDestructorCallbackTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clSetMemObjectDestructorCallbackTracer() {
+    ~ClSetMemObjectDestructorCallbackTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7282,9 +7282,9 @@ class clSetMemObjectDestructorCallbackTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clSetUserEventStatusTracer {
+class ClSetUserEventStatusTracer {
   public:
-    clSetUserEventStatusTracer() {}
+    ClSetUserEventStatusTracer() {}
 
     void enter(cl_event *event,
                cl_int *executionStatus) {
@@ -7334,7 +7334,7 @@ class clSetUserEventStatusTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clSetUserEventStatusTracer() {
+    ~ClSetUserEventStatusTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7345,9 +7345,9 @@ class clSetUserEventStatusTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clUnloadCompilerTracer {
+class ClUnloadCompilerTracer {
   public:
-    clUnloadCompilerTracer() {}
+    ClUnloadCompilerTracer() {}
 
     void enter() {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -7393,7 +7393,7 @@ class clUnloadCompilerTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clUnloadCompilerTracer() {
+    ~ClUnloadCompilerTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7403,9 +7403,9 @@ class clUnloadCompilerTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clUnloadPlatformCompilerTracer {
+class ClUnloadPlatformCompilerTracer {
   public:
-    clUnloadPlatformCompilerTracer() {}
+    ClUnloadPlatformCompilerTracer() {}
 
     void enter(cl_platform_id *platform) {
         DEBUG_BREAK_IF(state != TRACING_NOTIFY_STATE_NOTHING_CALLED);
@@ -7453,7 +7453,7 @@ class clUnloadPlatformCompilerTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clUnloadPlatformCompilerTracer() {
+    ~ClUnloadPlatformCompilerTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7464,9 +7464,9 @@ class clUnloadPlatformCompilerTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clWaitForEventsTracer {
+class ClWaitForEventsTracer {
   public:
-    clWaitForEventsTracer() {}
+    ClWaitForEventsTracer() {}
 
     void enter(cl_uint *numEvents,
                const cl_event **eventList) {
@@ -7516,7 +7516,7 @@ class clWaitForEventsTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clWaitForEventsTracer() {
+    ~ClWaitForEventsTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7529,9 +7529,9 @@ class clWaitForEventsTracer {
 
 #ifdef _WIN32
 
-class clCreateFromGLBufferTracer {
+class ClCreateFromGlBufferTracer {
   public:
-    clCreateFromGLBufferTracer() {}
+    ClCreateFromGlBufferTracer() {}
 
     void enter(cl_context *context,
                cl_mem_flags *flags,
@@ -7585,7 +7585,7 @@ class clCreateFromGLBufferTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateFromGLBufferTracer() {
+    ~ClCreateFromGlBufferTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7596,9 +7596,9 @@ class clCreateFromGLBufferTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateFromGLRenderbufferTracer {
+class ClCreateFromGlRenderbufferTracer {
   public:
-    clCreateFromGLRenderbufferTracer() {}
+    ClCreateFromGlRenderbufferTracer() {}
 
     void enter(cl_context *context,
                cl_mem_flags *flags,
@@ -7652,7 +7652,7 @@ class clCreateFromGLRenderbufferTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateFromGLRenderbufferTracer() {
+    ~ClCreateFromGlRenderbufferTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7663,9 +7663,9 @@ class clCreateFromGLRenderbufferTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateFromGLTextureTracer {
+class ClCreateFromGlTextureTracer {
   public:
-    clCreateFromGLTextureTracer() {}
+    ClCreateFromGlTextureTracer() {}
 
     void enter(cl_context *context,
                cl_mem_flags *flags,
@@ -7723,7 +7723,7 @@ class clCreateFromGLTextureTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateFromGLTextureTracer() {
+    ~ClCreateFromGlTextureTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7734,9 +7734,9 @@ class clCreateFromGLTextureTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateFromGLTexture2DTracer {
+class ClCreateFromGlTexture2DTracer {
   public:
-    clCreateFromGLTexture2DTracer() {}
+    ClCreateFromGlTexture2DTracer() {}
 
     void enter(cl_context *context,
                cl_mem_flags *flags,
@@ -7794,7 +7794,7 @@ class clCreateFromGLTexture2DTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateFromGLTexture2DTracer() {
+    ~ClCreateFromGlTexture2DTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7805,9 +7805,9 @@ class clCreateFromGLTexture2DTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clCreateFromGLTexture3DTracer {
+class ClCreateFromGlTexture3DTracer {
   public:
-    clCreateFromGLTexture3DTracer() {}
+    ClCreateFromGlTexture3DTracer() {}
 
     void enter(cl_context *context,
                cl_mem_flags *flags,
@@ -7865,7 +7865,7 @@ class clCreateFromGLTexture3DTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clCreateFromGLTexture3DTracer() {
+    ~ClCreateFromGlTexture3DTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7876,9 +7876,9 @@ class clCreateFromGLTexture3DTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueAcquireGLObjectsTracer {
+class ClEnqueueAcquireGlObjectsTracer {
   public:
-    clEnqueueAcquireGLObjectsTracer() {}
+    ClEnqueueAcquireGlObjectsTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_uint *numObjects,
@@ -7936,7 +7936,7 @@ class clEnqueueAcquireGLObjectsTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueAcquireGLObjectsTracer() {
+    ~ClEnqueueAcquireGlObjectsTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -7947,9 +7947,9 @@ class clEnqueueAcquireGLObjectsTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clEnqueueReleaseGLObjectsTracer {
+class ClEnqueueReleaseGlObjectsTracer {
   public:
-    clEnqueueReleaseGLObjectsTracer() {}
+    ClEnqueueReleaseGlObjectsTracer() {}
 
     void enter(cl_command_queue *commandQueue,
                cl_uint *numObjects,
@@ -8007,7 +8007,7 @@ class clEnqueueReleaseGLObjectsTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clEnqueueReleaseGLObjectsTracer() {
+    ~ClEnqueueReleaseGlObjectsTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -8018,9 +8018,9 @@ class clEnqueueReleaseGLObjectsTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetGLObjectInfoTracer {
+class ClGetGlObjectInfoTracer {
   public:
-    clGetGLObjectInfoTracer() {}
+    ClGetGlObjectInfoTracer() {}
 
     void enter(cl_mem *memobj,
                cl_gl_object_type **glObjectType,
@@ -8072,7 +8072,7 @@ class clGetGLObjectInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetGLObjectInfoTracer() {
+    ~ClGetGlObjectInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
@@ -8083,9 +8083,9 @@ class clGetGLObjectInfoTracer {
     tracing_notify_state_t state = TRACING_NOTIFY_STATE_NOTHING_CALLED;
 };
 
-class clGetGLTextureInfoTracer {
+class ClGetGlTextureInfoTracer {
   public:
-    clGetGLTextureInfoTracer() {}
+    ClGetGlTextureInfoTracer() {}
 
     void enter(cl_mem *memobj,
                cl_gl_texture_info *paramName,
@@ -8141,7 +8141,7 @@ class clGetGLTextureInfoTracer {
         state = TRACING_NOTIFY_STATE_EXIT_CALLED;
     }
 
-    ~clGetGLTextureInfoTracer() {
+    ~ClGetGlTextureInfoTracer() {
         DEBUG_BREAK_IF(state == TRACING_NOTIFY_STATE_ENTER_CALLED);
     }
 
diff --git a/opencl/test/unit_test/api/cl_create_buffer_tests.cpp b/opencl/test/unit_test/api/cl_create_buffer_tests.cpp
index d65b94afb4..1d94b5c178 100644
--- a/opencl/test/unit_test/api/cl_create_buffer_tests.cpp
+++ b/opencl/test/unit_test/api/cl_create_buffer_tests.cpp
@@ -23,7 +23,7 @@ typedef api_tests clCreateBufferTests;
 
 namespace ClCreateBufferTests {
 
-class clCreateBufferTemplateTests : public ApiFixture<>,
+class ClCreateBufferTemplateTests : public ApiFixture<>,
                                     public testing::TestWithParam<uint64_t> {
     void SetUp() override {
         ApiFixture::SetUp();
@@ -34,7 +34,7 @@ class clCreateBufferTemplateTests : public ApiFixture<>,
     }
 };
 
-struct clCreateBufferValidFlagsTests : public clCreateBufferTemplateTests {
+struct clCreateBufferValidFlagsTests : public ClCreateBufferTemplateTests {
     cl_uchar pHostPtr[64];
 };
 
@@ -72,7 +72,7 @@ INSTANTIATE_TEST_CASE_P(
     clCreateBufferValidFlagsTests,
     testing::ValuesIn(validFlags));
 
-using clCreateBufferInvalidFlagsTests = clCreateBufferTemplateTests;
+using clCreateBufferInvalidFlagsTests = ClCreateBufferTemplateTests;
 
 TEST_P(clCreateBufferInvalidFlagsTests, GivenInvalidFlagsWhenCreatingBufferThenBufferIsNotCreated) {
     cl_mem_flags flags = GetParam();
@@ -108,7 +108,7 @@ INSTANTIATE_TEST_CASE_P(
     clCreateBufferInvalidFlagsTests,
     testing::ValuesIn(invalidFlags));
 
-using clCreateBufferValidFlagsIntelTests = clCreateBufferTemplateTests;
+using clCreateBufferValidFlagsIntelTests = ClCreateBufferTemplateTests;
 
 TEST_P(clCreateBufferValidFlagsIntelTests, GivenValidFlagsIntelWhenCreatingBufferThenBufferIsCreated) {
     cl_mem_properties_intel properties[] = {CL_MEM_FLAGS_INTEL, GetParam(), 0};
@@ -130,7 +130,7 @@ INSTANTIATE_TEST_CASE_P(
     clCreateBufferValidFlagsIntelTests,
     testing::ValuesIn(validFlagsIntel));
 
-using clCreateBufferInvalidFlagsIntelTests = clCreateBufferTemplateTests;
+using clCreateBufferInvalidFlagsIntelTests = ClCreateBufferTemplateTests;
 
 TEST_P(clCreateBufferInvalidFlagsIntelTests, GivenInvalidFlagsIntelWhenCreatingBufferThenBufferIsNotCreated) {
     cl_mem_properties_intel properties[] = {CL_MEM_FLAGS_INTEL, GetParam(), 0};
@@ -149,7 +149,7 @@ INSTANTIATE_TEST_CASE_P(
     clCreateBufferInvalidFlagsIntelTests,
     testing::ValuesIn(invalidFlagsIntel));
 
-using clCreateBufferInvalidProperties = clCreateBufferTemplateTests;
+using clCreateBufferInvalidProperties = ClCreateBufferTemplateTests;
 
 TEST_F(clCreateBufferInvalidProperties, GivenInvalidPropertyKeyWhenCreatingBufferThenBufferIsNotCreated) {
     cl_mem_properties_intel properties[] = {(cl_mem_properties_intel(1) << 31), 0, 0};
@@ -534,7 +534,7 @@ TEST_F(clCreateBufferTestsWithRestrictions, GivenMemoryManagerRestrictionsWhenMi
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
-using clCreateBufferWithMultiDeviceContextTests = clCreateBufferTemplateTests;
+using clCreateBufferWithMultiDeviceContextTests = ClCreateBufferTemplateTests;
 
 TEST_P(clCreateBufferWithMultiDeviceContextTests, GivenBufferCreatedWithContextdWithMultiDeviceThenGraphicsAllocationsAreProperlyFilled) {
     UltClDeviceFactory deviceFactory{2, 0};
@@ -584,7 +584,7 @@ INSTANTIATE_TEST_CASE_P(
     clCreateBufferWithMultiDeviceContextTests,
     testing::ValuesIn(validFlagsForMultiDeviceContextBuffer));
 
-using clCreateBufferWithMultiDeviceContextFaillingAllocationTests = clCreateBufferTemplateTests;
+using clCreateBufferWithMultiDeviceContextFaillingAllocationTests = ClCreateBufferTemplateTests;
 
 TEST_F(clCreateBufferWithMultiDeviceContextFaillingAllocationTests, GivenContextdWithMultiDeviceFailingAllocationThenBufferAllocateFails) {
     UltClDeviceFactory deviceFactory{3, 0};
diff --git a/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp b/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp
index 8feb4d8108..646cd19c3e 100644
--- a/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp
+++ b/opencl/test/unit_test/api/cl_create_command_queue_with_properties_tests.cpp
@@ -477,11 +477,11 @@ std::pair<uint32_t, QueuePriority> priorityParams[3]{
     std::make_pair(CL_QUEUE_PRIORITY_MED_KHR, QueuePriority::MEDIUM),
     std::make_pair(CL_QUEUE_PRIORITY_HIGH_KHR, QueuePriority::HIGH)};
 
-class clCreateCommandQueueWithPropertiesApiPriority : public clCreateCommandQueueWithPropertiesApi,
+class ClCreateCommandQueueWithPropertiesApiPriority : public clCreateCommandQueueWithPropertiesApi,
                                                       public ::testing::WithParamInterface<std::pair<uint32_t, QueuePriority>> {
 };
 
-TEST_P(clCreateCommandQueueWithPropertiesApiPriority, GivenValidPriorityWhenCreatingCommandQueueWithPropertiesThenCorrectPriorityIsSetInternally) {
+TEST_P(ClCreateCommandQueueWithPropertiesApiPriority, GivenValidPriorityWhenCreatingCommandQueueWithPropertiesThenCorrectPriorityIsSetInternally) {
     cl_int retVal = CL_SUCCESS;
     cl_queue_properties ondevice[] = {CL_QUEUE_PRIORITY_KHR, GetParam().first, 0};
     auto cmdqd = clCreateCommandQueueWithProperties(pContext, testedClDevice, ondevice, &retVal);
@@ -496,7 +496,7 @@ TEST_P(clCreateCommandQueueWithPropertiesApiPriority, GivenValidPriorityWhenCrea
 }
 
 INSTANTIATE_TEST_CASE_P(AllValidPriorities,
-                        clCreateCommandQueueWithPropertiesApiPriority,
+                        ClCreateCommandQueueWithPropertiesApiPriority,
                         ::testing::ValuesIn(priorityParams));
 
 std::pair<uint32_t, QueueThrottle> throttleParams[3]{
@@ -504,11 +504,11 @@ std::pair<uint32_t, QueueThrottle> throttleParams[3]{
     std::make_pair(CL_QUEUE_THROTTLE_MED_KHR, QueueThrottle::MEDIUM),
     std::make_pair(CL_QUEUE_THROTTLE_HIGH_KHR, QueueThrottle::HIGH)};
 
-class clCreateCommandQueueWithPropertiesApiThrottle : public clCreateCommandQueueWithPropertiesApi,
+class ClCreateCommandQueueWithPropertiesApiThrottle : public clCreateCommandQueueWithPropertiesApi,
                                                       public ::testing::WithParamInterface<std::pair<uint32_t, QueueThrottle>> {
 };
 
-TEST_P(clCreateCommandQueueWithPropertiesApiThrottle, GivenThrottlePropertiesWhenCreatingCommandQueueWithPropertiesThenCorrectThrottleIsSetInternally) {
+TEST_P(ClCreateCommandQueueWithPropertiesApiThrottle, GivenThrottlePropertiesWhenCreatingCommandQueueWithPropertiesThenCorrectThrottleIsSetInternally) {
     cl_int retVal = CL_SUCCESS;
     cl_queue_properties ondevice[] = {CL_QUEUE_THROTTLE_KHR, GetParam().first, 0};
     auto cmdqd = clCreateCommandQueueWithProperties(pContext, testedClDevice, ondevice, &retVal);
@@ -523,7 +523,7 @@ TEST_P(clCreateCommandQueueWithPropertiesApiThrottle, GivenThrottlePropertiesWhe
 }
 
 INSTANTIATE_TEST_CASE_P(AllValidThrottleValues,
-                        clCreateCommandQueueWithPropertiesApiThrottle,
+                        ClCreateCommandQueueWithPropertiesApiThrottle,
                         ::testing::ValuesIn(throttleParams));
 
 } // namespace ULT
diff --git a/opencl/test/unit_test/api/cl_create_pipe_tests.inl b/opencl/test/unit_test/api/cl_create_pipe_tests.inl
index 7165bdaec3..06cd17dde5 100644
--- a/opencl/test/unit_test/api/cl_create_pipe_tests.inl
+++ b/opencl/test/unit_test/api/cl_create_pipe_tests.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -23,7 +23,7 @@ struct clCreatePipeTests : api_tests {
 
 namespace ClCreatePipeTests {
 
-class clCreatePipeWithParamTests : public ApiFixture<>, public testing::TestWithParam<uint64_t> {
+class ClCreatePipeWithParamTests : public ApiFixture<>, public testing::TestWithParam<uint64_t> {
     void SetUp() override {
         ApiFixture::SetUp();
     }
@@ -33,7 +33,7 @@ class clCreatePipeWithParamTests : public ApiFixture<>, public testing::TestWith
     VariableBackup<bool> supportsPipesBackup{&defaultHwInfo->capabilityTable.supportsPipes, true};
 };
 
-class clCreatePipeWithParamNegativeTests : public ApiFixture<>, public testing::TestWithParam<uint64_t> {
+class ClCreatePipeWithParamNegativeTests : public ApiFixture<>, public testing::TestWithParam<uint64_t> {
     void SetUp() override {
         ApiFixture::SetUp();
     }
@@ -43,7 +43,7 @@ class clCreatePipeWithParamNegativeTests : public ApiFixture<>, public testing::
     VariableBackup<bool> supportsPipesBackup{&defaultHwInfo->capabilityTable.supportsPipes, true};
 };
 
-TEST_P(clCreatePipeWithParamTests, GivenValidFlagsWhenCreatingPipeThenPipeIsCreatedAndSuccessIsReturned) {
+TEST_P(ClCreatePipeWithParamTests, GivenValidFlagsWhenCreatingPipeThenPipeIsCreatedAndSuccessIsReturned) {
     cl_mem_flags flags = GetParam();
 
     auto pipe = clCreatePipe(pContext, flags, 1, 20, nullptr, &retVal);
@@ -53,7 +53,7 @@ TEST_P(clCreatePipeWithParamTests, GivenValidFlagsWhenCreatingPipeThenPipeIsCrea
     clReleaseMemObject(pipe);
 }
 
-TEST_P(clCreatePipeWithParamNegativeTests, GivenInalidFlagsWhenCreatingPipeThenInvalidValueErrorIsReturned) {
+TEST_P(ClCreatePipeWithParamNegativeTests, GivenInalidFlagsWhenCreatingPipeThenInvalidValueErrorIsReturned) {
     cl_mem_flags flags = GetParam();
 
     auto pipe = clCreatePipe(pContext, flags, 1, 20, nullptr, &retVal);
@@ -93,12 +93,12 @@ static cl_mem_flags invalidFlags[] = {
 
 INSTANTIATE_TEST_CASE_P(
     CreatePipeCheckFlags,
-    clCreatePipeWithParamTests,
+    ClCreatePipeWithParamTests,
     testing::ValuesIn(validFlags));
 
 INSTANTIATE_TEST_CASE_P(
     CreatePipeCheckFlagsNegative,
-    clCreatePipeWithParamNegativeTests,
+    ClCreatePipeWithParamNegativeTests,
     testing::ValuesIn(invalidFlags));
 
 TEST_F(clCreatePipeTests, GivenValidFlagsAndNullReturnWhenCreatingPipeThenPipeIsCreated) {
diff --git a/opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl b/opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl
index 077acfe3f0..0106a9f058 100644
--- a/opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl
+++ b/opencl/test/unit_test/api/cl_create_sub_buffer_tests.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -14,7 +14,7 @@ using namespace NEO;
 namespace ClCreateSubbufferTests {
 
 template <bool hasHostPtr, cl_mem_flags parentFlags>
-class clCreateSubBufferTemplateTests : public ApiFixture<>,
+class ClCreateSubBufferTemplateTests : public ApiFixture<>,
                                        public testing::TestWithParam<uint64_t /*cl_mem_flags*/> {
     void SetUp() override {
         ApiFixture::SetUp();
@@ -42,7 +42,7 @@ class clCreateSubBufferTemplateTests : public ApiFixture<>,
 };
 
 struct clCreateSubBufferValidFlagsNoHostPtrTests
-    : public clCreateSubBufferTemplateTests<false, CL_MEM_READ_WRITE> {
+    : public ClCreateSubBufferTemplateTests<false, CL_MEM_READ_WRITE> {
 };
 
 TEST_P(clCreateSubBufferValidFlagsNoHostPtrTests, GivenValidFlagsWhenCreatingSubBufferThenSubBufferIsCreatedAndSuccessIsReturned) {
@@ -72,7 +72,7 @@ INSTANTIATE_TEST_CASE_P(
     testing::ValuesIn(validFlags));
 
 struct clCreateSubBufferInvalidFlagsHostPtrTests
-    : public clCreateSubBufferTemplateTests<true, CL_MEM_HOST_NO_ACCESS | CL_MEM_READ_ONLY> {
+    : public ClCreateSubBufferTemplateTests<true, CL_MEM_HOST_NO_ACCESS | CL_MEM_READ_ONLY> {
 };
 
 TEST_P(clCreateSubBufferInvalidFlagsHostPtrTests, GivenInvalidFlagsWhenCreatingSubBufferThenInvalidValueErrorIsReturned) {
@@ -101,7 +101,7 @@ INSTANTIATE_TEST_CASE_P(
     clCreateSubBufferInvalidFlagsHostPtrTests,
     testing::ValuesIn(invalidFlags));
 
-class clCreateSubBufferTests : public api_tests {
+class ClCreateSubBufferTests : public api_tests {
     void SetUp() override {
         api_tests::SetUp();
         cl_mem_flags flg = CL_MEM_READ_WRITE | CL_MEM_USE_HOST_PTR | CL_MEM_HOST_NO_ACCESS;
@@ -121,7 +121,7 @@ class clCreateSubBufferTests : public api_tests {
     cl_uchar pHostPtr[64];
 };
 
-TEST_F(clCreateSubBufferTests, GivenInBoundsRegionWhenCreatingSubBufferThenSubBufferIsCreatedAndSuccessIsReturned) {
+TEST_F(ClCreateSubBufferTests, GivenInBoundsRegionWhenCreatingSubBufferThenSubBufferIsCreatedAndSuccessIsReturned) {
     cl_buffer_region region = {0, 12};
 
     auto subBuffer = clCreateSubBuffer(buffer, CL_MEM_READ_WRITE, CL_BUFFER_CREATE_TYPE_REGION,
@@ -132,7 +132,7 @@ TEST_F(clCreateSubBufferTests, GivenInBoundsRegionWhenCreatingSubBufferThenSubBu
     clReleaseMemObject(subBuffer);
 }
 
-TEST_F(clCreateSubBufferTests, GivenOutOfBoundsRegionWhenCreatingSubBufferThenInvalidValueErrorIsReturned) {
+TEST_F(ClCreateSubBufferTests, GivenOutOfBoundsRegionWhenCreatingSubBufferThenInvalidValueErrorIsReturned) {
     cl_buffer_region region = {4, 68};
 
     auto subBuffer = clCreateSubBuffer(buffer, CL_MEM_READ_WRITE, CL_BUFFER_CREATE_TYPE_REGION,
@@ -141,7 +141,7 @@ TEST_F(clCreateSubBufferTests, GivenOutOfBoundsRegionWhenCreatingSubBufferThenIn
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
-TEST_F(clCreateSubBufferTests, GivenSubBufferAsBufferWhenCreatingSubBufferThenInvalidMemObjectErrorIsReturned) {
+TEST_F(ClCreateSubBufferTests, GivenSubBufferAsBufferWhenCreatingSubBufferThenInvalidMemObjectErrorIsReturned) {
     cl_buffer_region region0 = {0, 60};
     cl_buffer_region region1 = {8, 20};
 
@@ -158,7 +158,7 @@ TEST_F(clCreateSubBufferTests, GivenSubBufferAsBufferWhenCreatingSubBufferThenIn
     clReleaseMemObject(subBuffer);
 }
 
-TEST_F(clCreateSubBufferTests, GivenInvalidBufferObjectWhenCreatingSubBufferThenInvalidMemObjectErrorIsReturned) {
+TEST_F(ClCreateSubBufferTests, GivenInvalidBufferObjectWhenCreatingSubBufferThenInvalidMemObjectErrorIsReturned) {
     cl_buffer_region region = {4, 60};
     cl_int trash[] = {0x01, 0x08, 0x88, 0xcc, 0xab, 0x55};
 
@@ -168,7 +168,7 @@ TEST_F(clCreateSubBufferTests, GivenInvalidBufferObjectWhenCreatingSubBufferThen
     EXPECT_EQ(CL_INVALID_MEM_OBJECT, retVal);
 }
 
-TEST_F(clCreateSubBufferTests, GivenInvalidOffsetWhenCreatingSubBufferThenMisalignedSubBufferOffsetErrorIsReturned) {
+TEST_F(ClCreateSubBufferTests, GivenInvalidOffsetWhenCreatingSubBufferThenMisalignedSubBufferOffsetErrorIsReturned) {
     cl_buffer_region region = {1, 60};
 
     auto subBuffer = clCreateSubBuffer(buffer, CL_MEM_READ_WRITE,
@@ -177,7 +177,7 @@ TEST_F(clCreateSubBufferTests, GivenInvalidOffsetWhenCreatingSubBufferThenMisali
     EXPECT_EQ(CL_MISALIGNED_SUB_BUFFER_OFFSET, retVal);
 }
 
-TEST_F(clCreateSubBufferTests, GivenNoRegionWhenCreatingSubBufferThenInvalidValueErrorIsReturned) {
+TEST_F(ClCreateSubBufferTests, GivenNoRegionWhenCreatingSubBufferThenInvalidValueErrorIsReturned) {
     cl_buffer_region region = {4, 60};
 
     auto subBuffer = clCreateSubBuffer(buffer, CL_MEM_READ_WRITE, CL_BUFFER_CREATE_TYPE_REGION,
@@ -194,7 +194,7 @@ TEST_F(clCreateSubBufferTests, GivenNoRegionWhenCreatingSubBufferThenInvalidValu
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
-TEST_F(clCreateSubBufferTests, GivenBufferWithFlagsWhenCreatingSubBufferThenFlagsAreInherited) {
+TEST_F(ClCreateSubBufferTests, GivenBufferWithFlagsWhenCreatingSubBufferThenFlagsAreInherited) {
     cl_buffer_region region = {0, 60};
 
     auto subBuffer = clCreateSubBuffer(buffer, CL_MEM_READ_ONLY, CL_BUFFER_CREATE_TYPE_REGION,
diff --git a/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl b/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl
index bf676b712a..2673eb569d 100644
--- a/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl
+++ b/opencl/test/unit_test/api/cl_enqueue_verify_memory.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019-2021 Intel Corporation
+ * Copyright (C) 2019-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -26,36 +26,36 @@ struct clEnqueueVerifyMemoryINTELSettings {
     void *gpuAddress = expected;
 };
 
-class clEnqueueVerifyMemoryINTELTests : public api_tests,
+class ClEnqueueVerifyMemoryIntelTests : public api_tests,
                                         public clEnqueueVerifyMemoryINTELSettings {
 };
 
-TEST_F(clEnqueueVerifyMemoryINTELTests, givenSizeOfComparisonEqualZeroWhenCallingVerifyMemoryThenErrorIsReturned) {
+TEST_F(ClEnqueueVerifyMemoryIntelTests, givenSizeOfComparisonEqualZeroWhenCallingVerifyMemoryThenErrorIsReturned) {
     cl_int retval = clEnqueueVerifyMemoryINTEL(nullptr, nullptr, nullptr, 0, comparisonMode);
     EXPECT_EQ(CL_INVALID_VALUE, retval);
 }
 
-TEST_F(clEnqueueVerifyMemoryINTELTests, givenNullExpectedDataWhenCallingVerifyMemoryThenErrorIsReturned) {
+TEST_F(ClEnqueueVerifyMemoryIntelTests, givenNullExpectedDataWhenCallingVerifyMemoryThenErrorIsReturned) {
     cl_int retval = clEnqueueVerifyMemoryINTEL(nullptr, nullptr, nullptr, expectedSize, comparisonMode);
     EXPECT_EQ(CL_INVALID_VALUE, retval);
 }
 
-TEST_F(clEnqueueVerifyMemoryINTELTests, givenInvalidAllocationPointerWhenCallingVerifyMemoryThenErrorIsReturned) {
+TEST_F(ClEnqueueVerifyMemoryIntelTests, givenInvalidAllocationPointerWhenCallingVerifyMemoryThenErrorIsReturned) {
     cl_int retval = clEnqueueVerifyMemoryINTEL(nullptr, nullptr, expected, expectedSize, comparisonMode);
     EXPECT_EQ(CL_INVALID_VALUE, retval);
 }
 
-TEST_F(clEnqueueVerifyMemoryINTELTests, givenInvalidCommandQueueWhenCallingVerifyMemoryThenErrorIsReturned) {
+TEST_F(ClEnqueueVerifyMemoryIntelTests, givenInvalidCommandQueueWhenCallingVerifyMemoryThenErrorIsReturned) {
     cl_int retval = clEnqueueVerifyMemoryINTEL(nullptr, gpuAddress, expected, expectedSize, comparisonMode);
     EXPECT_EQ(CL_INVALID_COMMAND_QUEUE, retval);
 }
 
-TEST_F(clEnqueueVerifyMemoryINTELTests, givenEqualMemoryWhenCallingVerifyMemoryThenSuccessIsReturned) {
+TEST_F(ClEnqueueVerifyMemoryIntelTests, givenEqualMemoryWhenCallingVerifyMemoryThenSuccessIsReturned) {
     cl_int retval = clEnqueueVerifyMemoryINTEL(pCommandQueue, gpuAddress, expected, expectedSize, comparisonMode);
     EXPECT_EQ(CL_SUCCESS, retval);
 }
 
-TEST_F(clEnqueueVerifyMemoryINTELTests, givenNotEqualMemoryWhenCallingVerifyMemoryThenInvalidValueErrorIsReturned) {
+TEST_F(ClEnqueueVerifyMemoryIntelTests, givenNotEqualMemoryWhenCallingVerifyMemoryThenInvalidValueErrorIsReturned) {
     int differentMemory = expected[0] + 1;
     cl_int retval = clEnqueueVerifyMemoryINTEL(pCommandQueue, gpuAddress, &differentMemory, sizeof(differentMemory), comparisonMode);
     EXPECT_EQ(CL_INVALID_VALUE, retval);
diff --git a/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl b/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl
index 8407fdf5d1..4ee6a1bec3 100644
--- a/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl
+++ b/opencl/test/unit_test/api/cl_get_event_profiling_info_tests.inl
@@ -269,7 +269,7 @@ TEST_F(clEventProfilingTests, GivenPerfCountersEnabledWhenCheckingPerfCountersTh
     delete pEvent;
 }
 
-class clEventProfilingWithPerfCountersTests : public DeviceInstrumentationFixture,
+class ClEventProfilingWithPerfCountersTests : public DeviceInstrumentationFixture,
                                               public PerformanceCountersDeviceFixture,
                                               public ::testing::Test {
   public:
@@ -303,7 +303,7 @@ class clEventProfilingWithPerfCountersTests : public DeviceInstrumentationFixtur
     size_t param_value_size_ret = 0;
 };
 
-TEST_F(clEventProfilingWithPerfCountersTests, GivenDisabledPerfCountersWhenGettingEventProfilingInfoThenInvalidValueErrorIsReturned) {
+TEST_F(ClEventProfilingWithPerfCountersTests, GivenDisabledPerfCountersWhenGettingEventProfilingInfoThenInvalidValueErrorIsReturned) {
     event->setPerfCountersEnabled(false);
     cl_int retVal = clGetEventProfilingInfo(eventCl,
                                             CL_PROFILING_COMMAND_PERFCOUNTERS_INTEL,
@@ -313,7 +313,7 @@ TEST_F(clEventProfilingWithPerfCountersTests, GivenDisabledPerfCountersWhenGetti
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
-TEST_F(clEventProfilingWithPerfCountersTests, GivenEnabledPerfCountersWhenGettingEventProfilingInfoThenSuccessIsReturned) {
+TEST_F(ClEventProfilingWithPerfCountersTests, GivenEnabledPerfCountersWhenGettingEventProfilingInfoThenSuccessIsReturned) {
     event->setPerfCountersEnabled(true);
     cl_int retVal = clGetEventProfilingInfo(eventCl,
                                             CL_PROFILING_COMMAND_PERFCOUNTERS_INTEL,
@@ -323,7 +323,7 @@ TEST_F(clEventProfilingWithPerfCountersTests, GivenEnabledPerfCountersWhenGettin
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
-TEST_F(clEventProfilingWithPerfCountersTests, GivenEnabledPerfCountersAndIncorrectParamValueSizeWhenGettingEventProfilingInfoThenProfilingInfoNotAvailableErrorIsReturned) {
+TEST_F(ClEventProfilingWithPerfCountersTests, GivenEnabledPerfCountersAndIncorrectParamValueSizeWhenGettingEventProfilingInfoThenProfilingInfoNotAvailableErrorIsReturned) {
     event->setPerfCountersEnabled(true);
     cl_int retVal = clGetEventProfilingInfo(eventCl,
                                             CL_PROFILING_COMMAND_PERFCOUNTERS_INTEL,
diff --git a/opencl/test/unit_test/api/cl_get_platform_info_tests.inl b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl
index a39d0588fd..46c0715689 100644
--- a/opencl/test/unit_test/api/cl_get_platform_info_tests.inl
+++ b/opencl/test/unit_test/api/cl_get_platform_info_tests.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -47,7 +47,7 @@ TEST_F(clGetPlatformInfoTests, GivenClPlatformProfileWhenGettingPlatformInfoStri
     EXPECT_STREQ(paramValue, "FULL_PROFILE");
 }
 
-class clGetPlatformInfoParameterizedTests : public clGetPlatformInfoTests,
+class ClGetPlatformInfoParameterizedTests : public clGetPlatformInfoTests,
                                             public ::testing::WithParamInterface<uint32_t> {
     void SetUp() override {
         DebugManager.flags.ForceOCLVersion.set(GetParam());
@@ -60,7 +60,7 @@ class clGetPlatformInfoParameterizedTests : public clGetPlatformInfoTests,
     }
 };
 
-TEST_P(clGetPlatformInfoParameterizedTests, GivenClPlatformVersionWhenGettingPlatformInfoStringThenCorrectOpenClVersionIsReturned) {
+TEST_P(ClGetPlatformInfoParameterizedTests, GivenClPlatformVersionWhenGettingPlatformInfoStringThenCorrectOpenClVersionIsReturned) {
     paramValue = getPlatformInfoString(pPlatform, CL_PLATFORM_VERSION);
 
     cl_version platformNumericVersion = 0;
@@ -92,7 +92,7 @@ TEST_P(clGetPlatformInfoParameterizedTests, GivenClPlatformVersionWhenGettingPla
 }
 
 INSTANTIATE_TEST_CASE_P(OCLVersions,
-                        clGetPlatformInfoParameterizedTests,
+                        ClGetPlatformInfoParameterizedTests,
                         ::testing::Values(12, 21, 30));
 
 TEST_F(clGetPlatformInfoTests, GivenClPlatformNameWhenGettingPlatformInfoStringThenCorrectStringIsReturned) {
diff --git a/opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl b/opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl
index f40c7faaac..cecbdbd475 100644
--- a/opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl
+++ b/opencl/test/unit_test/api/cl_retain_release_command_queue_tests.inl
@@ -14,7 +14,7 @@
 using namespace NEO;
 namespace ULT {
 
-class clRetainReleaseCommandQueueTests : public ApiFixture<>,
+class ClRetainReleaseCommandQueueTests : public ApiFixture<>,
                                          public ::testing::Test {
   public:
     void SetUp() override {
@@ -32,7 +32,7 @@ class clRetainReleaseCommandQueueTests : public ApiFixture<>,
     cl_queue_properties noProperties[5] = {0};
 };
 
-TEST_F(clRetainReleaseCommandQueueTests, GivenValidCommandQueueWhenRetainingAndReleasingThenReferenceCountIsUpdatedCorrectly) {
+TEST_F(ClRetainReleaseCommandQueueTests, GivenValidCommandQueueWhenRetainingAndReleasingThenReferenceCountIsUpdatedCorrectly) {
 
     auto queue = this->createClQueue();
     ASSERT_EQ(CL_SUCCESS, this->retVal);
diff --git a/opencl/test/unit_test/api/cl_set_event_callback_tests.inl b/opencl/test/unit_test/api/cl_set_event_callback_tests.inl
index e5f2831484..d34f1a389e 100644
--- a/opencl/test/unit_test/api/cl_set_event_callback_tests.inl
+++ b/opencl/test/unit_test/api/cl_set_event_callback_tests.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2021 Intel Corporation
+ * Copyright (C) 2018-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,7 +21,7 @@ void CL_CALLBACK eventCallBack(cl_event event, cl_int callbackType, void *userDa
     cbData = userData;
 }
 
-class clSetEventCallbackTests : public ApiFixture<>,
+class ClSetEventCallbackTests : public ApiFixture<>,
                                 public ::testing::Test {
 
     void SetUp() override {
@@ -39,7 +39,7 @@ class clSetEventCallbackTests : public ApiFixture<>,
     std::unique_ptr<DebugManagerStateRestore> dbgRestore;
 };
 
-TEST_F(clSetEventCallbackTests, GivenValidEventWhenSettingEventCallbackThenSuccessIsReturned) {
+TEST_F(ClSetEventCallbackTests, GivenValidEventWhenSettingEventCallbackThenSuccessIsReturned) {
     std::unique_ptr<Event> event(new Event(nullptr, 0, 0, 0));
     retVal = clSetEventCallback(event.get(), CL_COMPLETE, eventCallBack, nullptr);
 
@@ -47,14 +47,14 @@ TEST_F(clSetEventCallbackTests, GivenValidEventWhenSettingEventCallbackThenSucce
     event->decRefInternal();
 }
 
-TEST_F(clSetEventCallbackTests, GivenInvalidEventWhenSettingEventCallbackThenInvalidEventErrorIsReturned) {
+TEST_F(ClSetEventCallbackTests, GivenInvalidEventWhenSettingEventCallbackThenInvalidEventErrorIsReturned) {
     std::unique_ptr<char> event(new char[sizeof(Event)]);
     memset(event.get(), 0, sizeof(Event));
     retVal = clSetEventCallback(reinterpret_cast<cl_event>(event.get()), CL_COMPLETE, eventCallBack, nullptr);
     EXPECT_EQ(CL_INVALID_EVENT, retVal);
 }
 
-TEST_F(clSetEventCallbackTests, GivenValidCallbackTypeWhenSettingEventCallbackThenSuccessIsReturned) {
+TEST_F(ClSetEventCallbackTests, GivenValidCallbackTypeWhenSettingEventCallbackThenSuccessIsReturned) {
     std::unique_ptr<Event> event(new Event(nullptr, 0, 0, 0));
     retVal = clSetEventCallback(event.get(), CL_COMPLETE, eventCallBack, nullptr);
     EXPECT_EQ(CL_SUCCESS, retVal);
@@ -70,19 +70,19 @@ TEST_F(clSetEventCallbackTests, GivenValidCallbackTypeWhenSettingEventCallbackTh
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
-TEST_F(clSetEventCallbackTests, GivenInvalidCallbackTypeWhenSettingEventCallbackThenInvalidValueErrorIsReturned) {
+TEST_F(ClSetEventCallbackTests, GivenInvalidCallbackTypeWhenSettingEventCallbackThenInvalidValueErrorIsReturned) {
     std::unique_ptr<Event> event(new Event(nullptr, 0, 0, 0));
     retVal = clSetEventCallback(event.get(), CL_COMPLETE + CL_RUNNING + CL_SUBMITTED, eventCallBack, nullptr);
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
-TEST_F(clSetEventCallbackTests, GivenNullCallbackWhenSettingEventCallbackThenInvalidValueErrorIsReturned) {
+TEST_F(ClSetEventCallbackTests, GivenNullCallbackWhenSettingEventCallbackThenInvalidValueErrorIsReturned) {
     std::unique_ptr<Event> event(new Event(nullptr, 0, 0, 0));
     retVal = clSetEventCallback(event.get(), CL_COMPLETE, nullptr, nullptr);
     EXPECT_EQ(CL_INVALID_VALUE, retVal);
 }
 
-TEST_F(clSetEventCallbackTests, GivenMultipleCallbacksWhenSettingEventCallbackThenSuccessIsReturned) {
+TEST_F(ClSetEventCallbackTests, GivenMultipleCallbacksWhenSettingEventCallbackThenSuccessIsReturned) {
     std::unique_ptr<Event> event(new Event(nullptr, 0, 0, 0));
     retVal = clSetEventCallback(event.get(), CL_COMPLETE, eventCallBack, nullptr);
     EXPECT_EQ(CL_SUCCESS, retVal);
@@ -94,7 +94,7 @@ TEST_F(clSetEventCallbackTests, GivenMultipleCallbacksWhenSettingEventCallbackTh
     event->decRefInternal();
 }
 
-TEST_F(clSetEventCallbackTests, GivenValidCallbackWhenStatusIsSetToCompleteThenCallbackWasInvokedOnce) {
+TEST_F(ClSetEventCallbackTests, GivenValidCallbackWhenStatusIsSetToCompleteThenCallbackWasInvokedOnce) {
     std::unique_ptr<Event> event(new Event(nullptr, 0, 0, 0));
     retVal = clSetEventCallback(event.get(), CL_COMPLETE, eventCallBack, nullptr);
     EXPECT_EQ(CL_SUCCESS, retVal);
@@ -102,7 +102,7 @@ TEST_F(clSetEventCallbackTests, GivenValidCallbackWhenStatusIsSetToCompleteThenC
     EXPECT_EQ(cbInvoked, 1);
 }
 
-TEST_F(clSetEventCallbackTests, GivenThreeCallbacksWhenStatusIsSetToCompleteThenCallbackWasInvokedThreeTimes) {
+TEST_F(ClSetEventCallbackTests, GivenThreeCallbacksWhenStatusIsSetToCompleteThenCallbackWasInvokedThreeTimes) {
     std::unique_ptr<Event> event(new Event(nullptr, 0, 0, 0));
     retVal = clSetEventCallback(event.get(), CL_COMPLETE, eventCallBack, nullptr);
     EXPECT_EQ(CL_SUCCESS, retVal);
@@ -115,7 +115,7 @@ TEST_F(clSetEventCallbackTests, GivenThreeCallbacksWhenStatusIsSetToCompleteThen
     EXPECT_EQ(cbInvoked, 3);
 }
 
-TEST_F(clSetEventCallbackTests, GivenValidCallbackWhenStatusIsSetToCompleteMultipleTimesThenCallbackWasInvokedOnce) {
+TEST_F(ClSetEventCallbackTests, GivenValidCallbackWhenStatusIsSetToCompleteMultipleTimesThenCallbackWasInvokedOnce) {
     std::unique_ptr<Event> event(new Event(nullptr, 0, 0, 0));
     retVal = clSetEventCallback(event.get(), CL_COMPLETE, eventCallBack, nullptr);
     event->setStatus(CL_COMPLETE);
@@ -124,7 +124,7 @@ TEST_F(clSetEventCallbackTests, GivenValidCallbackWhenStatusIsSetToCompleteMulti
     EXPECT_EQ(cbInvoked, 1);
 }
 
-TEST_F(clSetEventCallbackTests, GivenThreeCallbacksWhenStatusIsSetToCompleteMultipleTimesThenCallbackWasInvokedThreeTimes) {
+TEST_F(ClSetEventCallbackTests, GivenThreeCallbacksWhenStatusIsSetToCompleteMultipleTimesThenCallbackWasInvokedThreeTimes) {
     std::unique_ptr<Event> event(new Event(nullptr, 0, 0, 0));
     retVal = clSetEventCallback(event.get(), CL_COMPLETE, eventCallBack, nullptr);
     EXPECT_EQ(CL_SUCCESS, retVal);
@@ -139,7 +139,7 @@ TEST_F(clSetEventCallbackTests, GivenThreeCallbacksWhenStatusIsSetToCompleteMult
     EXPECT_EQ(cbInvoked, 3);
 }
 
-TEST_F(clSetEventCallbackTests, GivenUserDataWhenStatusIsSetToCompleteThenCallbackWasInvokedOnce) {
+TEST_F(ClSetEventCallbackTests, GivenUserDataWhenStatusIsSetToCompleteThenCallbackWasInvokedOnce) {
     std::unique_ptr<Event> event(new Event(nullptr, 0, 0, 0));
     int data = 1;
     retVal = clSetEventCallback(event.get(), CL_COMPLETE, eventCallBack, &data);
diff --git a/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl
index b8f930271e..fe6d192b03 100644
--- a/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl
+++ b/opencl/test/unit_test/api/cl_set_kernel_arg_svm_pointer_tests.inl
@@ -18,7 +18,7 @@
 
 using namespace NEO;
 
-class KernelArgSvmFixture : public ApiFixture<> {
+class KernelArgSvmApiFixture : public ApiFixture<> {
   protected:
     void SetUp() override {
         ApiFixture::SetUp();
@@ -55,7 +55,7 @@ class KernelArgSvmFixture : public ApiFixture<> {
     char pCrossThreadData[64]{};
 };
 
-typedef Test<KernelArgSvmFixture> clSetKernelArgSVMPointerTests;
+typedef Test<KernelArgSvmApiFixture> clSetKernelArgSVMPointerTests;
 
 namespace ULT {
 
diff --git a/opencl/test/unit_test/api/cl_svm_alloc_tests.inl b/opencl/test/unit_test/api/cl_svm_alloc_tests.inl
index d2e3c790af..c7916d8a29 100644
--- a/opencl/test/unit_test/api/cl_svm_alloc_tests.inl
+++ b/opencl/test/unit_test/api/cl_svm_alloc_tests.inl
@@ -21,7 +21,7 @@ typedef api_tests clSVMAllocTests;
 
 namespace ULT {
 
-class clSVMAllocTemplateTests : public ApiFixture<>,
+class ClSvmAllocTemplateTests : public ApiFixture<>,
                                 public testing::TestWithParam<uint64_t /*cl_mem_flags*/> {
   public:
     void SetUp() override {
@@ -34,7 +34,7 @@ class clSVMAllocTemplateTests : public ApiFixture<>,
     }
 };
 
-struct clSVMAllocValidFlagsTests : public clSVMAllocTemplateTests {
+struct clSVMAllocValidFlagsTests : public ClSvmAllocTemplateTests {
     cl_uchar pHostPtr[64];
 };
 
@@ -112,7 +112,7 @@ INSTANTIATE_TEST_CASE_P(
     clSVMAllocValidFlagsTests,
     testing::ValuesIn(SVMAllocValidFlags));
 
-using clSVMAllocFtrFlagsTests = clSVMAllocTemplateTests;
+using clSVMAllocFtrFlagsTests = ClSvmAllocTemplateTests;
 
 INSTANTIATE_TEST_CASE_P(
     SVMAllocCheckFlagsFtrFlags,
@@ -151,7 +151,7 @@ TEST_P(clSVMAllocFtrFlagsTests, GivenCorrectFlagsWhenAllocatingSvmThenSvmIsAlloc
     clSVMFree(pContext, svmPtr);
 };
 
-struct clSVMAllocInvalidFlagsTests : public clSVMAllocTemplateTests {
+struct clSVMAllocInvalidFlagsTests : public ClSvmAllocTemplateTests {
 };
 
 TEST_P(clSVMAllocInvalidFlagsTests, GivenInvalidFlagsWhenAllocatingSvmThenSvmIsNotAllocated) {
diff --git a/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl b/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl
index ab78fc68f9..5337ee95e4 100644
--- a/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl
+++ b/opencl/test/unit_test/api/cl_unified_shared_memory_tests.inl
@@ -906,7 +906,7 @@ TEST(clUnifiedSharedMemoryTests, whenClEnqueueMemAdviseINTELisCalledWithProperPa
     EXPECT_EQ(CL_SUCCESS, retVal);
 }
 
-class clUnifiedSharedMemoryEventTests : public CommandQueueHwFixture,
+class ClUnifiedSharedMemoryEventTests : public CommandQueueHwFixture,
                                         public ::testing::Test {
   public:
     void SetUp() override {
@@ -920,7 +920,7 @@ class clUnifiedSharedMemoryEventTests : public CommandQueueHwFixture,
     cl_event event = nullptr;
 };
 
-TEST_F(clUnifiedSharedMemoryEventTests, whenClEnqueueMigrateMemINTELIsCalledWithEventThenProperCmdTypeIsSet) {
+TEST_F(ClUnifiedSharedMemoryEventTests, whenClEnqueueMigrateMemINTELIsCalledWithEventThenProperCmdTypeIsSet) {
     void *unifiedMemoryAlloc = reinterpret_cast<void *>(0x1234);
 
     auto retVal = clEnqueueMigrateMemINTEL(this->pCmdQ, unifiedMemoryAlloc, 10, 0, 0, nullptr, &event);
@@ -931,7 +931,7 @@ TEST_F(clUnifiedSharedMemoryEventTests, whenClEnqueueMigrateMemINTELIsCalledWith
     EXPECT_EQ(expectedCmd, actualCmd);
 }
 
-TEST_F(clUnifiedSharedMemoryEventTests, whenClEnqueueMemAdviseINTELIsCalledWithEventThenProperCmdTypeIsSet) {
+TEST_F(ClUnifiedSharedMemoryEventTests, whenClEnqueueMemAdviseINTELIsCalledWithEventThenProperCmdTypeIsSet) {
     void *unifiedMemoryAlloc = reinterpret_cast<void *>(0x1234);
 
     auto retVal = clEnqueueMemAdviseINTEL(this->pCmdQ, unifiedMemoryAlloc, 10, 0, 0, nullptr, &event);
@@ -942,7 +942,7 @@ TEST_F(clUnifiedSharedMemoryEventTests, whenClEnqueueMemAdviseINTELIsCalledWithE
     EXPECT_EQ(expectedCmd, actualCmd);
 }
 
-TEST_F(clUnifiedSharedMemoryEventTests, whenClEnqueueMemcpyINTELIsCalledWithEventThenProperCmdTypeIsSet) {
+TEST_F(ClUnifiedSharedMemoryEventTests, whenClEnqueueMemcpyINTELIsCalledWithEventThenProperCmdTypeIsSet) {
     const ClDeviceInfo &devInfo = this->context->getDevice(0u)->getDeviceInfo();
     if (devInfo.svmCapabilities == 0) {
         GTEST_SKIP();
@@ -963,7 +963,7 @@ TEST_F(clUnifiedSharedMemoryEventTests, whenClEnqueueMemcpyINTELIsCalledWithEven
     clMemFreeINTEL(this->context, unifiedMemorySrc);
 }
 
-TEST_F(clUnifiedSharedMemoryEventTests, whenClEnqueueMemsetINTELIsCalledWithEventThenProperCmdTypeIsSet) {
+TEST_F(ClUnifiedSharedMemoryEventTests, whenClEnqueueMemsetINTELIsCalledWithEventThenProperCmdTypeIsSet) {
     const ClDeviceInfo &devInfo = this->context->getDevice(0u)->getDeviceInfo();
     if (devInfo.svmCapabilities == 0) {
         GTEST_SKIP();
@@ -982,7 +982,7 @@ TEST_F(clUnifiedSharedMemoryEventTests, whenClEnqueueMemsetINTELIsCalledWithEven
     clMemFreeINTEL(this->context, unifiedMemorySharedAllocation);
 }
 
-TEST_F(clUnifiedSharedMemoryEventTests, whenClEnqueueMemFillINTELIsCalledWithEventThenProperCmdTypeIsSet) {
+TEST_F(ClUnifiedSharedMemoryEventTests, whenClEnqueueMemFillINTELIsCalledWithEventThenProperCmdTypeIsSet) {
     const ClDeviceInfo &devInfo = this->context->getDevice(0u)->getDeviceInfo();
     if (devInfo.svmCapabilities == 0) {
         GTEST_SKIP();
diff --git a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp
index 01fea1f452..d3b0c10291 100644
--- a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp
+++ b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp
@@ -175,7 +175,7 @@ void MulticontextAubFixture::overridePlatformConfigForAllEnginesSupport(Hardware
 #ifdef SUPPORT_XE_HP_SDV
         if (localHwInfo.platform.eProductFamily == IGFX_XE_HP_SDV) {
             setupCalled = true;
-            XE_HP_SDV_CONFIG::setupHardwareInfo(&localHwInfo, true);
+            XehpSdvHwConfig::setupHardwareInfo(&localHwInfo, true);
 
             // Mock values
             localHwInfo.gtSystemInfo.SliceCount = 8;
@@ -195,7 +195,7 @@ void MulticontextAubFixture::overridePlatformConfigForAllEnginesSupport(Hardware
             ASSERT_TRUE(numberOfEnabledTiles == 1);
             setupCalled = true;
 
-            DG2_CONFIG::setupHardwareInfo(&localHwInfo, true);
+            Dg2HwConfig::setupHardwareInfo(&localHwInfo, true);
 
             // Mock values
             localHwInfo.gtSystemInfo.SliceCount = 8;
@@ -214,7 +214,7 @@ void MulticontextAubFixture::overridePlatformConfigForAllEnginesSupport(Hardware
         if (localHwInfo.platform.eProductFamily == IGFX_PVC) {
             setupCalled = true;
 
-            PVC_CONFIG::setupHardwareInfo(&localHwInfo, true);
+            PvcHwConfig::setupHardwareInfo(&localHwInfo, true);
 
             // Mock values
             localHwInfo.gtSystemInfo.SliceCount = 8;
diff --git a/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp
index ab8676e033..3988166b68 100644
--- a/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_waitlist_tests.cpp
@@ -9,23 +9,23 @@
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 
-class clEventWrapper {
+class ClEventWrapper {
   public:
-    clEventWrapper() { mMem = NULL; }
-    clEventWrapper(cl_event mem) { mMem = mem; }
-    clEventWrapper(const clEventWrapper &rhs) : mMem(rhs.mMem) {
+    ClEventWrapper() { mMem = NULL; }
+    ClEventWrapper(cl_event mem) { mMem = mem; }
+    ClEventWrapper(const ClEventWrapper &rhs) : mMem(rhs.mMem) {
         if (mMem != NULL)
             clRetainEvent(mMem);
     }
-    ~clEventWrapper() {
+    ~ClEventWrapper() {
         if (mMem != NULL)
             clReleaseEvent(mMem);
     }
-    clEventWrapper &operator=(const cl_event &rhs) {
+    ClEventWrapper &operator=(const cl_event &rhs) {
         mMem = rhs;
         return *this;
     }
-    clEventWrapper &operator=(clEventWrapper rhs) {
+    ClEventWrapper &operator=(ClEventWrapper rhs) {
         std::swap(mMem, rhs.mMem);
         return *this;
     }
@@ -168,11 +168,11 @@ struct EnqueueWaitlistTest : public EnqueueWaitlistFixture,
 TEST_P(EnqueueWaitlistTest, GivenCompletedUserEventOnWaitlistWhenWaitingForOutputEventThenOutputEventIsCompleted) {
 
     // Set up a user event, which we use as a gate for the second event
-    clEventWrapper gateEvent = clCreateUserEvent(context, &error);
+    ClEventWrapper gateEvent = clCreateUserEvent(context, &error);
     testError(error, "Unable to set up user gate event");
 
     // Set up the execution of the action with its actual event
-    clEventWrapper actualEvent;
+    ClEventWrapper actualEvent;
 
     // call the function to execute
     GetParam()(this, 1, &gateEvent, &actualEvent, false);
@@ -190,11 +190,11 @@ typedef EnqueueWaitlistTest EnqueueWaitlistTestTwoMapEnqueues;
 TEST_P(EnqueueWaitlistTestTwoMapEnqueues, GivenCompletedUserEventOnWaitlistWhenWaitingForOutputEventThenOutputEventIsCompleted) {
 
     // Set up a user event, which we use as a gate for the second event
-    clEventWrapper gateEvent = clCreateUserEvent(context, &error);
+    ClEventWrapper gateEvent = clCreateUserEvent(context, &error);
     testError(error, "Unable to set up user gate event");
 
     // Set up the execution of the action with its actual event
-    clEventWrapper actualEvent;
+    ClEventWrapper actualEvent;
 
     // call the function to execute
     GetParam()(this, 1, &gateEvent, &actualEvent, false);
@@ -210,7 +210,7 @@ TEST_P(EnqueueWaitlistTestTwoMapEnqueues, GivenCompletedUserEventOnWaitlistWhenW
 TEST_P(EnqueueWaitlistTest, GivenCompletedUserEventOnWaitlistWhenFinishingCommandQueueThenSuccessIsReturned) {
 
     // Set up a user event, which we use as a gate for the second event
-    clEventWrapper gateEvent = clCreateUserEvent(context, &error);
+    ClEventWrapper gateEvent = clCreateUserEvent(context, &error);
     testError(error, "Unable to set up user gate event");
 
     // call the function to execute
diff --git a/opencl/test/unit_test/gen11/ehl/linux/dll/device_id_tests_ehl.cpp b/opencl/test/unit_test/gen11/ehl/linux/dll/device_id_tests_ehl.cpp
index 7ffc172ee3..ef8d814036 100644
--- a/opencl/test/unit_test/gen11/ehl/linux/dll/device_id_tests_ehl.cpp
+++ b/opencl/test/unit_test/gen11/ehl/linux/dll/device_id_tests_ehl.cpp
@@ -11,15 +11,15 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenEhlSpportedDeviceIdWhenCheckingHwSetupThenItIsCorrect) {
     std::array<DeviceDescriptor, 9> expectedDescriptors = {{
-        {0x4500, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo},
-        {0x4541, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo},
-        {0x4551, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo},
-        {0x4571, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo},
-        {0x4555, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo},
-        {0x4E51, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo},
-        {0x4E61, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo},
-        {0x4E71, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo},
-        {0x4E55, &EHL_HW_CONFIG::hwInfo, &EHL_HW_CONFIG::setupHardwareInfo},
+        {0x4500, &EhlHwConfig::hwInfo, &EhlHwConfig::setupHardwareInfo},
+        {0x4541, &EhlHwConfig::hwInfo, &EhlHwConfig::setupHardwareInfo},
+        {0x4551, &EhlHwConfig::hwInfo, &EhlHwConfig::setupHardwareInfo},
+        {0x4571, &EhlHwConfig::hwInfo, &EhlHwConfig::setupHardwareInfo},
+        {0x4555, &EhlHwConfig::hwInfo, &EhlHwConfig::setupHardwareInfo},
+        {0x4E51, &EhlHwConfig::hwInfo, &EhlHwConfig::setupHardwareInfo},
+        {0x4E61, &EhlHwConfig::hwInfo, &EhlHwConfig::setupHardwareInfo},
+        {0x4E71, &EhlHwConfig::hwInfo, &EhlHwConfig::setupHardwareInfo},
+        {0x4E55, &EhlHwConfig::hwInfo, &EhlHwConfig::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/opencl/test/unit_test/gen11/icllp/linux/dll/device_id_tests_icllp.cpp b/opencl/test/unit_test/gen11/icllp/linux/dll/device_id_tests_icllp.cpp
index fb70be89e1..1cd1f86cf6 100644
--- a/opencl/test/unit_test/gen11/icllp/linux/dll/device_id_tests_icllp.cpp
+++ b/opencl/test/unit_test/gen11/icllp/linux/dll/device_id_tests_icllp.cpp
@@ -11,16 +11,16 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenIcllpSupportedDeviceIdThenHardwareInfoIsCorrect) {
     std::array<DeviceDescriptor, 8> expectedDescriptors = {{
-        {0xFF05, &ICLLP_1x4x8::hwInfo, &ICLLP_1x4x8::setupHardwareInfo},
-        {0x8A56, &ICLLP_1x4x8::hwInfo, &ICLLP_1x4x8::setupHardwareInfo},
-        {0x8A58, &ICLLP_1x4x8::hwInfo, &ICLLP_1x4x8::setupHardwareInfo},
+        {0xFF05, &IcllpHw1x4x8::hwInfo, &IcllpHw1x4x8::setupHardwareInfo},
+        {0x8A56, &IcllpHw1x4x8::hwInfo, &IcllpHw1x4x8::setupHardwareInfo},
+        {0x8A58, &IcllpHw1x4x8::hwInfo, &IcllpHw1x4x8::setupHardwareInfo},
 
-        {0x8A5C, &ICLLP_1x6x8::hwInfo, &ICLLP_1x6x8::setupHardwareInfo},
-        {0x8A5A, &ICLLP_1x6x8::hwInfo, &ICLLP_1x6x8::setupHardwareInfo},
+        {0x8A5C, &IcllpHw1x6x8::hwInfo, &IcllpHw1x6x8::setupHardwareInfo},
+        {0x8A5A, &IcllpHw1x6x8::hwInfo, &IcllpHw1x6x8::setupHardwareInfo},
 
-        {0x8A50, &ICLLP_1x8x8::hwInfo, &ICLLP_1x8x8::setupHardwareInfo},
-        {0x8A52, &ICLLP_1x8x8::hwInfo, &ICLLP_1x8x8::setupHardwareInfo},
-        {0x8A51, &ICLLP_1x8x8::hwInfo, &ICLLP_1x8x8::setupHardwareInfo},
+        {0x8A50, &IcllpHw1x8x8::hwInfo, &IcllpHw1x8x8::setupHardwareInfo},
+        {0x8A52, &IcllpHw1x8x8::hwInfo, &IcllpHw1x8x8::setupHardwareInfo},
+        {0x8A51, &IcllpHw1x8x8::hwInfo, &IcllpHw1x8x8::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/opencl/test/unit_test/gen11/lkf/linux/dll/device_id_tests_lkf.cpp b/opencl/test/unit_test/gen11/lkf/linux/dll/device_id_tests_lkf.cpp
index 210a35b72a..fd68495ed4 100644
--- a/opencl/test/unit_test/gen11/lkf/linux/dll/device_id_tests_lkf.cpp
+++ b/opencl/test/unit_test/gen11/lkf/linux/dll/device_id_tests_lkf.cpp
@@ -11,7 +11,7 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenLkfSupportedDeviceIdThenHardwareInfoIsCorrect) {
     std::array<DeviceDescriptor, 1> expectedDescriptors = {{
-        {0x9840, &LKF_1x8x8::hwInfo, &LKF_1x8x8::setupHardwareInfo},
+        {0x9840, &LkfHw1x8x8::hwInfo, &LkfHw1x8x8::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/opencl/test/unit_test/gen12lp/adln/linux/dll/device_id_tests_adln.cpp b/opencl/test/unit_test/gen12lp/adln/linux/dll/device_id_tests_adln.cpp
index 0a2d948d30..9cd799feee 100644
--- a/opencl/test/unit_test/gen12lp/adln/linux/dll/device_id_tests_adln.cpp
+++ b/opencl/test/unit_test/gen12lp/adln/linux/dll/device_id_tests_adln.cpp
@@ -15,7 +15,7 @@ using namespace NEO;
 
 TEST(AdlnDeviceIdTest, GivenSupportedDeviceIdThenHardwareInfoIsCorrect) {
     std::array<DeviceDescriptor, 1> expectedDescriptors = {{
-        {0x46D0, &ADLN_CONFIG::hwInfo, &ADLN_CONFIG::setupHardwareInfo},
+        {0x46D0, &AdlnHwConfig::hwInfo, &AdlnHwConfig::setupHardwareInfo},
     }};
 
     auto compareStructs = [](const DeviceDescriptor *first, const DeviceDescriptor *second) {
diff --git a/opencl/test/unit_test/gen12lp/adlp/linux/dll/device_id_tests_adlp.cpp b/opencl/test/unit_test/gen12lp/adlp/linux/dll/device_id_tests_adlp.cpp
index c306186b89..189c8e2bc2 100644
--- a/opencl/test/unit_test/gen12lp/adlp/linux/dll/device_id_tests_adlp.cpp
+++ b/opencl/test/unit_test/gen12lp/adlp/linux/dll/device_id_tests_adlp.cpp
@@ -11,30 +11,30 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenAdlpSupportedDeviceIdThenDeviceDescriptorTableExists) {
     std::array<DeviceDescriptor, 24> expectedDescriptors = {{
-        {0x46A0, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x46B0, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x46A1, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x46A2, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x46A3, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x46A6, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x46A8, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x46AA, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x462A, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x4626, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x4628, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x46B1, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x46B2, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x46B3, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x46C0, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x46C1, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x46C2, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0x46C3, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0xA7A0, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0xA720, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0xA7A8, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0xA7A1, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0xA721, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
-        {0xA7A9, &ADLP_CONFIG::hwInfo, &ADLP_CONFIG::setupHardwareInfo},
+        {0x46A0, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x46B0, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x46A1, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x46A2, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x46A3, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x46A6, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x46A8, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x46AA, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x462A, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x4626, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x4628, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x46B1, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x46B2, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x46B3, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x46C0, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x46C1, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x46C2, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0x46C3, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0xA7A0, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0xA720, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0xA7A8, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0xA7A1, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0xA721, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
+        {0xA7A9, &AdlpHwConfig::hwInfo, &AdlpHwConfig::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/opencl/test/unit_test/gen12lp/adls/linux/dll/device_id_tests_adls.cpp b/opencl/test/unit_test/gen12lp/adls/linux/dll/device_id_tests_adls.cpp
index 478451e87a..873466f8b0 100644
--- a/opencl/test/unit_test/gen12lp/adls/linux/dll/device_id_tests_adls.cpp
+++ b/opencl/test/unit_test/gen12lp/adls/linux/dll/device_id_tests_adls.cpp
@@ -11,19 +11,19 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenAdlsSupportedDeviceIdThenHardwareInfoIsCorrect) {
     std::array<DeviceDescriptor, 13> expectedDescriptors = {{
-        {0x4680, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo},
-        {0x4682, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo},
-        {0x4688, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo},
-        {0x468A, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo},
-        {0x4690, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo},
-        {0x4692, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo},
-        {0x4693, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo},
-        {0xA780, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo},
-        {0xA781, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo},
-        {0xA782, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo},
-        {0xA783, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo},
-        {0xA788, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo},
-        {0xA789, &ADLS_HW_CONFIG::hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo},
+        {0x4680, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
+        {0x4682, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
+        {0x4688, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
+        {0x468A, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
+        {0x4690, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
+        {0x4692, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
+        {0x4693, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
+        {0xA780, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
+        {0xA781, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
+        {0xA782, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
+        {0xA783, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
+        {0xA788, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
+        {0xA789, &AdlsHwConfig::hwInfo, &AdlsHwConfig::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/opencl/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp
index 5cddd67ad1..eb1863e685 100644
--- a/opencl/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp
+++ b/opencl/test/unit_test/gen12lp/dg1/hw_info_tests_dg1.cpp
@@ -15,7 +15,7 @@ using namespace NEO;
 
 template <typename T>
 class Dg1HwInfoTests : public ::testing::Test {};
-typedef ::testing::Types<DG1_CONFIG> dg1TestTypes;
+typedef ::testing::Types<Dg1HwConfig> dg1TestTypes;
 TYPED_TEST_CASE(Dg1HwInfoTests, dg1TestTypes);
 
 TYPED_TEST(Dg1HwInfoTests, WhenSetupHardwareInfoWithSetupFeatureTableFlagTrueOrFalseIsCalledThenFeatureTableHasCorrectValueOfLocalMemoryFeature) {
diff --git a/opencl/test/unit_test/gen12lp/dg1/linux/dll/device_id_tests_dg1.cpp b/opencl/test/unit_test/gen12lp/dg1/linux/dll/device_id_tests_dg1.cpp
index 694247bad1..42d25e5750 100644
--- a/opencl/test/unit_test/gen12lp/dg1/linux/dll/device_id_tests_dg1.cpp
+++ b/opencl/test/unit_test/gen12lp/dg1/linux/dll/device_id_tests_dg1.cpp
@@ -10,10 +10,10 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenDg1SupportedDeviceIdThenHardwareInfoIsCorrect) {
     std::array<DeviceDescriptor, 4> expectedDescriptors = {{
-        {0x4905, &DG1_CONFIG::hwInfo, &DG1_CONFIG::setupHardwareInfo},
-        {0x4906, &DG1_CONFIG::hwInfo, &DG1_CONFIG::setupHardwareInfo},
-        {0x4907, &DG1_CONFIG::hwInfo, &DG1_CONFIG::setupHardwareInfo},
-        {0x4908, &DG1_CONFIG::hwInfo, &DG1_CONFIG::setupHardwareInfo},
+        {0x4905, &Dg1HwConfig::hwInfo, &Dg1HwConfig::setupHardwareInfo},
+        {0x4906, &Dg1HwConfig::hwInfo, &Dg1HwConfig::setupHardwareInfo},
+        {0x4907, &Dg1HwConfig::hwInfo, &Dg1HwConfig::setupHardwareInfo},
+        {0x4908, &Dg1HwConfig::hwInfo, &Dg1HwConfig::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/opencl/test/unit_test/gen12lp/rkl/linux/dll/device_id_tests_rkl.cpp b/opencl/test/unit_test/gen12lp/rkl/linux/dll/device_id_tests_rkl.cpp
index 37bb27a8be..aaf03d4e16 100644
--- a/opencl/test/unit_test/gen12lp/rkl/linux/dll/device_id_tests_rkl.cpp
+++ b/opencl/test/unit_test/gen12lp/rkl/linux/dll/device_id_tests_rkl.cpp
@@ -10,12 +10,12 @@
 using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenRklSupportedDeviceIdThenHardwareInfoIsCorrect) {
-    std::array<DeviceDescriptor, 6> expectedDescriptors = {{{0x4C80, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo},
-                                                            {0x4C8A, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo},
-                                                            {0x4C8B, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo},
-                                                            {0x4C8C, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo},
-                                                            {0x4C90, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo},
-                                                            {0x4C9A, &RKL_HW_CONFIG::hwInfo, &RKL_HW_CONFIG::setupHardwareInfo}}};
+    std::array<DeviceDescriptor, 6> expectedDescriptors = {{{0x4C80, &RklHwConfig::hwInfo, &RklHwConfig::setupHardwareInfo},
+                                                            {0x4C8A, &RklHwConfig::hwInfo, &RklHwConfig::setupHardwareInfo},
+                                                            {0x4C8B, &RklHwConfig::hwInfo, &RklHwConfig::setupHardwareInfo},
+                                                            {0x4C8C, &RklHwConfig::hwInfo, &RklHwConfig::setupHardwareInfo},
+                                                            {0x4C90, &RklHwConfig::hwInfo, &RklHwConfig::setupHardwareInfo},
+                                                            {0x4C9A, &RklHwConfig::hwInfo, &RklHwConfig::setupHardwareInfo}}};
 
     testImpl(expectedDescriptors);
 }
diff --git a/opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp b/opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp
index 9e426dcb70..e3db2db322 100644
--- a/opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp
+++ b/opencl/test/unit_test/gen12lp/tgllp/linux/dll/device_id_tests_tgllp.cpp
@@ -11,14 +11,14 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenTgllpSupportedDeviceIdThenHardwareInfoIsCorrect) {
     std::array<DeviceDescriptor, 8> expectedDescriptors = {{
-        {0xFF20, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo},
-        {0x9A49, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo},
-        {0x9A40, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo},
-        {0x9A59, &TGLLP_1x6x16::hwInfo, &TGLLP_1x6x16::setupHardwareInfo},
-        {0x9A60, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo},
-        {0x9A68, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo},
-        {0x9A70, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo},
-        {0x9A78, &TGLLP_1x2x16::hwInfo, &TGLLP_1x2x16::setupHardwareInfo},
+        {0xFF20, &TgllpHw1x6x16::hwInfo, &TgllpHw1x6x16::setupHardwareInfo},
+        {0x9A49, &TgllpHw1x6x16::hwInfo, &TgllpHw1x6x16::setupHardwareInfo},
+        {0x9A40, &TgllpHw1x6x16::hwInfo, &TgllpHw1x6x16::setupHardwareInfo},
+        {0x9A59, &TgllpHw1x6x16::hwInfo, &TgllpHw1x6x16::setupHardwareInfo},
+        {0x9A60, &TgllpHw1x2x16::hwInfo, &TgllpHw1x2x16::setupHardwareInfo},
+        {0x9A68, &TgllpHw1x2x16::hwInfo, &TgllpHw1x2x16::setupHardwareInfo},
+        {0x9A70, &TgllpHw1x2x16::hwInfo, &TgllpHw1x2x16::setupHardwareInfo},
+        {0x9A78, &TgllpHw1x2x16::hwInfo, &TgllpHw1x2x16::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/opencl/test/unit_test/gen8/bdw/linux/dll/device_id_tests_bdw.cpp b/opencl/test/unit_test/gen8/bdw/linux/dll/device_id_tests_bdw.cpp
index 673699fbab..452c175aa2 100644
--- a/opencl/test/unit_test/gen8/bdw/linux/dll/device_id_tests_bdw.cpp
+++ b/opencl/test/unit_test/gen8/bdw/linux/dll/device_id_tests_bdw.cpp
@@ -11,24 +11,24 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenBdwSupportedDeviceIdThenHardwareInfoIsCorrect) {
     std::array<DeviceDescriptor, 16> expectedDescriptors = {{
-        {0x1602, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo},
-        {0x160A, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo},
-        {0x1606, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo},
-        {0x160E, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo},
-        {0x160D, &BDW_1x2x6::hwInfo, &BDW_1x2x6::setupHardwareInfo},
+        {0x1602, &BdwHw1x2x6::hwInfo, &BdwHw1x2x6::setupHardwareInfo},
+        {0x160A, &BdwHw1x2x6::hwInfo, &BdwHw1x2x6::setupHardwareInfo},
+        {0x1606, &BdwHw1x2x6::hwInfo, &BdwHw1x2x6::setupHardwareInfo},
+        {0x160E, &BdwHw1x2x6::hwInfo, &BdwHw1x2x6::setupHardwareInfo},
+        {0x160D, &BdwHw1x2x6::hwInfo, &BdwHw1x2x6::setupHardwareInfo},
 
-        {0x1612, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo},
-        {0x161A, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo},
-        {0x1616, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo},
-        {0x161E, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo},
-        {0x161D, &BDW_1x3x8::hwInfo, &BDW_1x3x8::setupHardwareInfo},
+        {0x1612, &BdwHw1x3x8::hwInfo, &BdwHw1x3x8::setupHardwareInfo},
+        {0x161A, &BdwHw1x3x8::hwInfo, &BdwHw1x3x8::setupHardwareInfo},
+        {0x1616, &BdwHw1x3x8::hwInfo, &BdwHw1x3x8::setupHardwareInfo},
+        {0x161E, &BdwHw1x3x8::hwInfo, &BdwHw1x3x8::setupHardwareInfo},
+        {0x161D, &BdwHw1x3x8::hwInfo, &BdwHw1x3x8::setupHardwareInfo},
 
-        {0x1622, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo},
-        {0x162A, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo},
-        {0x1626, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo},
-        {0x162B, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo},
-        {0x162E, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo},
-        {0x162D, &BDW_2x3x8::hwInfo, &BDW_2x3x8::setupHardwareInfo},
+        {0x1622, &BdwHw2x3x8::hwInfo, &BdwHw2x3x8::setupHardwareInfo},
+        {0x162A, &BdwHw2x3x8::hwInfo, &BdwHw2x3x8::setupHardwareInfo},
+        {0x1626, &BdwHw2x3x8::hwInfo, &BdwHw2x3x8::setupHardwareInfo},
+        {0x162B, &BdwHw2x3x8::hwInfo, &BdwHw2x3x8::setupHardwareInfo},
+        {0x162E, &BdwHw2x3x8::hwInfo, &BdwHw2x3x8::setupHardwareInfo},
+        {0x162D, &BdwHw2x3x8::hwInfo, &BdwHw2x3x8::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/opencl/test/unit_test/gen9/bxt/linux/dll/device_id_tests.cpp b/opencl/test/unit_test/gen9/bxt/linux/dll/device_id_tests.cpp
index 3ed3f8bbdb..18b68f4582 100644
--- a/opencl/test/unit_test/gen9/bxt/linux/dll/device_id_tests.cpp
+++ b/opencl/test/unit_test/gen9/bxt/linux/dll/device_id_tests.cpp
@@ -11,14 +11,14 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenBxtSupportedDeviceIdThenHardwareInfoIsCorrect) {
     std::array<DeviceDescriptor, 8> expectedDescriptors = {{
-        {0x9906, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo},
-        {0x9907, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo},
-        {0x0A84, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo},
-        {0x5A84, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo},
-        {0x5A85, &BXT_1x2x6::hwInfo, &BXT_1x2x6::setupHardwareInfo},
-        {0x1A85, &BXT_1x2x6::hwInfo, &BXT_1x2x6::setupHardwareInfo},
-        {0x1A84, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo},
-        {0x9908, &BXT_1x3x6::hwInfo, &BXT_1x3x6::setupHardwareInfo},
+        {0x9906, &BxtHw1x3x6::hwInfo, &BxtHw1x3x6::setupHardwareInfo},
+        {0x9907, &BxtHw1x3x6::hwInfo, &BxtHw1x3x6::setupHardwareInfo},
+        {0x0A84, &BxtHw1x3x6::hwInfo, &BxtHw1x3x6::setupHardwareInfo},
+        {0x5A84, &BxtHw1x3x6::hwInfo, &BxtHw1x3x6::setupHardwareInfo},
+        {0x5A85, &BxtHw1x2x6::hwInfo, &BxtHw1x2x6::setupHardwareInfo},
+        {0x1A85, &BxtHw1x2x6::hwInfo, &BxtHw1x2x6::setupHardwareInfo},
+        {0x1A84, &BxtHw1x3x6::hwInfo, &BxtHw1x3x6::setupHardwareInfo},
+        {0x9908, &BxtHw1x3x6::hwInfo, &BxtHw1x3x6::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/opencl/test/unit_test/gen9/cfl/linux/dll/device_id_tests_cfl.cpp b/opencl/test/unit_test/gen9/cfl/linux/dll/device_id_tests_cfl.cpp
index fcc5eb5621..dd4a2d5ba0 100644
--- a/opencl/test/unit_test/gen9/cfl/linux/dll/device_id_tests_cfl.cpp
+++ b/opencl/test/unit_test/gen9/cfl/linux/dll/device_id_tests_cfl.cpp
@@ -11,51 +11,51 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenCflSupportedDeviceIdThenHardwareInfoIsCorrect) {
     std::array<DeviceDescriptor, 42> expectedDescriptors = {{
-        {0x3E90, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
-        {0x3E93, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
-        {0x3EA4, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
-        {0x3E99, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
-        {0x3EA1, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
+        {0x3E90, &CflHw1x2x6::hwInfo, &CflHw1x2x6::setupHardwareInfo},
+        {0x3E93, &CflHw1x2x6::hwInfo, &CflHw1x2x6::setupHardwareInfo},
+        {0x3EA4, &CflHw1x2x6::hwInfo, &CflHw1x2x6::setupHardwareInfo},
+        {0x3E99, &CflHw1x2x6::hwInfo, &CflHw1x2x6::setupHardwareInfo},
+        {0x3EA1, &CflHw1x2x6::hwInfo, &CflHw1x2x6::setupHardwareInfo},
 
-        {0x3E92, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x3E9B, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x3E94, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x3E91, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x3E96, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x3E9A, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x3EA3, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x3EA9, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x3EA0, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x3E98, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
+        {0x3E92, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x3E9B, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x3E94, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x3E91, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x3E96, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x3E9A, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x3EA3, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x3EA9, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x3EA0, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x3E98, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
 
-        {0x3E95, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo},
-        {0x3EA6, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo},
-        {0x3EA7, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo},
-        {0x3EA8, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo},
-        {0x3EA5, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo},
-        {0x3EA2, &CFL_2x3x8::hwInfo, &CFL_2x3x8::setupHardwareInfo},
+        {0x3E95, &CflHw2x3x8::hwInfo, &CflHw2x3x8::setupHardwareInfo},
+        {0x3EA6, &CflHw2x3x8::hwInfo, &CflHw2x3x8::setupHardwareInfo},
+        {0x3EA7, &CflHw2x3x8::hwInfo, &CflHw2x3x8::setupHardwareInfo},
+        {0x3EA8, &CflHw2x3x8::hwInfo, &CflHw2x3x8::setupHardwareInfo},
+        {0x3EA5, &CflHw2x3x8::hwInfo, &CflHw2x3x8::setupHardwareInfo},
+        {0x3EA2, &CflHw2x3x8::hwInfo, &CflHw2x3x8::setupHardwareInfo},
 
-        {0x9B21, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
-        {0x9BAA, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
-        {0x9BAB, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
-        {0x9BAC, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
-        {0x9BA0, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
-        {0x9BA5, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
-        {0x9BA8, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
-        {0x9BA4, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
-        {0x9BA2, &CFL_1x2x6::hwInfo, &CFL_1x2x6::setupHardwareInfo},
-        {0x9B41, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x9BCA, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x9BCB, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x9BCC, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x9BC0, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x9BC5, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x9BC8, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x9BC4, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x9BC2, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x9BC6, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x9BE6, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
-        {0x9BF6, &CFL_1x3x8::hwInfo, &CFL_1x3x8::setupHardwareInfo},
+        {0x9B21, &CflHw1x2x6::hwInfo, &CflHw1x2x6::setupHardwareInfo},
+        {0x9BAA, &CflHw1x2x6::hwInfo, &CflHw1x2x6::setupHardwareInfo},
+        {0x9BAB, &CflHw1x2x6::hwInfo, &CflHw1x2x6::setupHardwareInfo},
+        {0x9BAC, &CflHw1x2x6::hwInfo, &CflHw1x2x6::setupHardwareInfo},
+        {0x9BA0, &CflHw1x2x6::hwInfo, &CflHw1x2x6::setupHardwareInfo},
+        {0x9BA5, &CflHw1x2x6::hwInfo, &CflHw1x2x6::setupHardwareInfo},
+        {0x9BA8, &CflHw1x2x6::hwInfo, &CflHw1x2x6::setupHardwareInfo},
+        {0x9BA4, &CflHw1x2x6::hwInfo, &CflHw1x2x6::setupHardwareInfo},
+        {0x9BA2, &CflHw1x2x6::hwInfo, &CflHw1x2x6::setupHardwareInfo},
+        {0x9B41, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x9BCA, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x9BCB, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x9BCC, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x9BC0, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x9BC5, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x9BC8, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x9BC4, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x9BC2, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x9BC6, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x9BE6, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
+        {0x9BF6, &CflHw1x3x8::hwInfo, &CflHw1x3x8::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/opencl/test/unit_test/gen9/glk/linux/dll/device_id_tests_glk.cpp b/opencl/test/unit_test/gen9/glk/linux/dll/device_id_tests_glk.cpp
index af26393b2a..acefda10e7 100644
--- a/opencl/test/unit_test/gen9/glk/linux/dll/device_id_tests_glk.cpp
+++ b/opencl/test/unit_test/gen9/glk/linux/dll/device_id_tests_glk.cpp
@@ -11,8 +11,8 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenGlkSupportedDeviceIdThenHardwareInfoIsCorrect) {
     std::array<DeviceDescriptor, 2> expectedDescriptors = {{
-        {0x3184, &GLK_1x3x6::hwInfo, &GLK_1x3x6::setupHardwareInfo},
-        {0x3185, &GLK_1x2x6::hwInfo, &GLK_1x2x6::setupHardwareInfo},
+        {0x3184, &GlkHw1x3x6::hwInfo, &GlkHw1x3x6::setupHardwareInfo},
+        {0x3185, &GlkHw1x2x6::hwInfo, &GlkHw1x2x6::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/opencl/test/unit_test/gen9/kbl/linux/dll/device_id_tests_kbl.cpp b/opencl/test/unit_test/gen9/kbl/linux/dll/device_id_tests_kbl.cpp
index 13a337b409..423bc9f860 100644
--- a/opencl/test/unit_test/gen9/kbl/linux/dll/device_id_tests_kbl.cpp
+++ b/opencl/test/unit_test/gen9/kbl/linux/dll/device_id_tests_kbl.cpp
@@ -11,36 +11,36 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenKblSupportedDeviceIdThenHardwareInfoIsCorrect) {
     std::array<DeviceDescriptor, 26> expectedDescriptors = {{
-        {0x5902, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo},
-        {0x590B, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo},
-        {0x590A, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo},
-        {0x5906, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo},
-        {0x590E, &KBL_1x3x6::hwInfo, &KBL_1x3x6::setupHardwareInfo},
-        {0x5908, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo},
+        {0x5902, &KblHw1x2x6::hwInfo, &KblHw1x2x6::setupHardwareInfo},
+        {0x590B, &KblHw1x2x6::hwInfo, &KblHw1x2x6::setupHardwareInfo},
+        {0x590A, &KblHw1x2x6::hwInfo, &KblHw1x2x6::setupHardwareInfo},
+        {0x5906, &KblHw1x2x6::hwInfo, &KblHw1x2x6::setupHardwareInfo},
+        {0x590E, &KblHw1x3x6::hwInfo, &KblHw1x3x6::setupHardwareInfo},
+        {0x5908, &KblHw1x2x6::hwInfo, &KblHw1x2x6::setupHardwareInfo},
 
-        {0x5913, &KBL_1x3x6::hwInfo, &KBL_1x3x6::setupHardwareInfo},
-        {0x5915, &KBL_1x2x6::hwInfo, &KBL_1x2x6::setupHardwareInfo},
+        {0x5913, &KblHw1x3x6::hwInfo, &KblHw1x3x6::setupHardwareInfo},
+        {0x5915, &KblHw1x2x6::hwInfo, &KblHw1x2x6::setupHardwareInfo},
 
-        {0x5912, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
-        {0x591B, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
-        {0x5917, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
-        {0x591A, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
-        {0x5916, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
-        {0x591E, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
-        {0x591D, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
-        {0x591C, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
-        {0x5921, &KBL_1x3x8::hwInfo, &KBL_1x3x8::setupHardwareInfo},
+        {0x5912, &KblHw1x3x8::hwInfo, &KblHw1x3x8::setupHardwareInfo},
+        {0x591B, &KblHw1x3x8::hwInfo, &KblHw1x3x8::setupHardwareInfo},
+        {0x5917, &KblHw1x3x8::hwInfo, &KblHw1x3x8::setupHardwareInfo},
+        {0x591A, &KblHw1x3x8::hwInfo, &KblHw1x3x8::setupHardwareInfo},
+        {0x5916, &KblHw1x3x8::hwInfo, &KblHw1x3x8::setupHardwareInfo},
+        {0x591E, &KblHw1x3x8::hwInfo, &KblHw1x3x8::setupHardwareInfo},
+        {0x591D, &KblHw1x3x8::hwInfo, &KblHw1x3x8::setupHardwareInfo},
+        {0x591C, &KblHw1x3x8::hwInfo, &KblHw1x3x8::setupHardwareInfo},
+        {0x5921, &KblHw1x3x8::hwInfo, &KblHw1x3x8::setupHardwareInfo},
 
-        {0x5926, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo},
-        {0x5927, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo},
-        {0x592B, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo},
-        {0x592A, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo},
-        {0x5923, &KBL_2x3x8::hwInfo, &KBL_2x3x8::setupHardwareInfo},
+        {0x5926, &KblHw2x3x8::hwInfo, &KblHw2x3x8::setupHardwareInfo},
+        {0x5927, &KblHw2x3x8::hwInfo, &KblHw2x3x8::setupHardwareInfo},
+        {0x592B, &KblHw2x3x8::hwInfo, &KblHw2x3x8::setupHardwareInfo},
+        {0x592A, &KblHw2x3x8::hwInfo, &KblHw2x3x8::setupHardwareInfo},
+        {0x5923, &KblHw2x3x8::hwInfo, &KblHw2x3x8::setupHardwareInfo},
 
-        {0x5932, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo},
-        {0x593B, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo},
-        {0x593A, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo},
-        {0x593D, &KBL_3x3x8::hwInfo, &KBL_3x3x8::setupHardwareInfo},
+        {0x5932, &KblHw3x3x8::hwInfo, &KblHw3x3x8::setupHardwareInfo},
+        {0x593B, &KblHw3x3x8::hwInfo, &KblHw3x3x8::setupHardwareInfo},
+        {0x593A, &KblHw3x3x8::hwInfo, &KblHw3x3x8::setupHardwareInfo},
+        {0x593D, &KblHw3x3x8::hwInfo, &KblHw3x3x8::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/opencl/test/unit_test/gen9/skl/linux/dll/device_id_tests_skl.cpp b/opencl/test/unit_test/gen9/skl/linux/dll/device_id_tests_skl.cpp
index bbe5e47a1b..fe3ee856fa 100644
--- a/opencl/test/unit_test/gen9/skl/linux/dll/device_id_tests_skl.cpp
+++ b/opencl/test/unit_test/gen9/skl/linux/dll/device_id_tests_skl.cpp
@@ -11,36 +11,36 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenSklSupportedDeviceIdThenHardwareInfoIsCorrect) {
     std::array<DeviceDescriptor, 26> expectedDescriptors = {{
-        {0x1902, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo},
-        {0x190B, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo},
-        {0x190A, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo},
-        {0x1906, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo},
-        {0x190E, &SKL_1x2x6::hwInfo, &SKL_1x2x6::setupHardwareInfo},
+        {0x1902, &SklHw1x2x6::hwInfo, &SklHw1x2x6::setupHardwareInfo},
+        {0x190B, &SklHw1x2x6::hwInfo, &SklHw1x2x6::setupHardwareInfo},
+        {0x190A, &SklHw1x2x6::hwInfo, &SklHw1x2x6::setupHardwareInfo},
+        {0x1906, &SklHw1x2x6::hwInfo, &SklHw1x2x6::setupHardwareInfo},
+        {0x190E, &SklHw1x2x6::hwInfo, &SklHw1x2x6::setupHardwareInfo},
 
-        {0x1917, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo},
-        {0x1913, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo},
-        {0x1915, &SKL_1x3x6::hwInfo, &SKL_1x3x6::setupHardwareInfo},
+        {0x1917, &SklHw1x3x6::hwInfo, &SklHw1x3x6::setupHardwareInfo},
+        {0x1913, &SklHw1x3x6::hwInfo, &SklHw1x3x6::setupHardwareInfo},
+        {0x1915, &SklHw1x3x6::hwInfo, &SklHw1x3x6::setupHardwareInfo},
 
-        {0x1912, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
-        {0x191B, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
-        {0x191A, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
-        {0x1916, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
-        {0x191E, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
-        {0x191D, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
-        {0x1921, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
-        {0x9905, &SKL_1x3x8::hwInfo, &SKL_1x3x8::setupHardwareInfo},
+        {0x1912, &SklHw1x3x8::hwInfo, &SklHw1x3x8::setupHardwareInfo},
+        {0x191B, &SklHw1x3x8::hwInfo, &SklHw1x3x8::setupHardwareInfo},
+        {0x191A, &SklHw1x3x8::hwInfo, &SklHw1x3x8::setupHardwareInfo},
+        {0x1916, &SklHw1x3x8::hwInfo, &SklHw1x3x8::setupHardwareInfo},
+        {0x191E, &SklHw1x3x8::hwInfo, &SklHw1x3x8::setupHardwareInfo},
+        {0x191D, &SklHw1x3x8::hwInfo, &SklHw1x3x8::setupHardwareInfo},
+        {0x1921, &SklHw1x3x8::hwInfo, &SklHw1x3x8::setupHardwareInfo},
+        {0x9905, &SklHw1x3x8::hwInfo, &SklHw1x3x8::setupHardwareInfo},
 
-        {0x192B, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo},
-        {0x192D, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo},
-        {0x192A, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo},
-        {0x1923, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo},
-        {0x1926, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo},
-        {0x1927, &SKL_2x3x8::hwInfo, &SKL_2x3x8::setupHardwareInfo},
+        {0x192B, &SklHw2x3x8::hwInfo, &SklHw2x3x8::setupHardwareInfo},
+        {0x192D, &SklHw2x3x8::hwInfo, &SklHw2x3x8::setupHardwareInfo},
+        {0x192A, &SklHw2x3x8::hwInfo, &SklHw2x3x8::setupHardwareInfo},
+        {0x1923, &SklHw2x3x8::hwInfo, &SklHw2x3x8::setupHardwareInfo},
+        {0x1926, &SklHw2x3x8::hwInfo, &SklHw2x3x8::setupHardwareInfo},
+        {0x1927, &SklHw2x3x8::hwInfo, &SklHw2x3x8::setupHardwareInfo},
 
-        {0x1932, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo},
-        {0x193B, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo},
-        {0x193A, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo},
-        {0x193D, &SKL_3x3x8::hwInfo, &SKL_3x3x8::setupHardwareInfo},
+        {0x1932, &SklHw3x3x8::hwInfo, &SklHw3x3x8::setupHardwareInfo},
+        {0x193B, &SklHw3x3x8::hwInfo, &SklHw3x3x8::setupHardwareInfo},
+        {0x193A, &SklHw3x3x8::hwInfo, &SklHw3x3x8::setupHardwareInfo},
+        {0x193D, &SklHw3x3x8::hwInfo, &SklHw3x3x8::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/opencl/test/unit_test/helpers/hw_helper_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_tests.cpp
index f7f7cb9fb0..104228e905 100644
--- a/opencl/test/unit_test/helpers/hw_helper_tests.cpp
+++ b/opencl/test/unit_test/helpers/hw_helper_tests.cpp
@@ -102,18 +102,18 @@ HWTEST_F(HwHelperTest, givenForceExtendedKernelIsaSizeSetWhenGettingISAPaddingTh
 HWTEST_F(HwHelperTest, WhenSettingRenderSurfaceStateForBufferThenL1CachePolicyIsSet) {
     using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE;
     using SURFACE_TYPE = typename RENDER_SURFACE_STATE::SURFACE_TYPE;
-    class mockHwHelperHw : public HwHelperHw<FamilyType> {
+    class MockHwHelperHw : public HwHelperHw<FamilyType> {
       public:
         bool called = false;
         using HwHelperHw<FamilyType>::HwHelperHw;
-        mockHwHelperHw() {}
+        MockHwHelperHw() {}
         void setL1CachePolicy(bool useL1Cache, typename FamilyType::RENDER_SURFACE_STATE *surfaceState, const HardwareInfo *hwInfo) override {
             HwHelperHw<FamilyType>::setL1CachePolicy(useL1Cache, surfaceState, hwInfo);
             called = true;
         }
     };
 
-    mockHwHelperHw helper;
+    MockHwHelperHw helper;
     void *stateBuffer = alignedMalloc(sizeof(RENDER_SURFACE_STATE), sizeof(RENDER_SURFACE_STATE));
     ASSERT_NE(nullptr, stateBuffer);
     memset(stateBuffer, 0, sizeof(RENDER_SURFACE_STATE));
diff --git a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp
index 71ac0c4442..988eb790eb 100644
--- a/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp
+++ b/opencl/test/unit_test/kernel/kernel_arg_svm_tests.cpp
@@ -23,12 +23,12 @@
 
 using namespace NEO;
 
-class KernelArgSvmFixture_ : public ContextFixture, public ClDeviceFixture {
+class KernelArgSvmFixture : public ContextFixture, public ClDeviceFixture {
 
     using ContextFixture::SetUp;
 
   public:
-    KernelArgSvmFixture_() {
+    KernelArgSvmFixture() {
     }
 
   protected:
@@ -70,7 +70,7 @@ class KernelArgSvmFixture_ : public ContextFixture, public ClDeviceFixture {
     char pCrossThreadData[64];
 };
 
-typedef Test<KernelArgSvmFixture_> KernelArgSvmTest;
+typedef Test<KernelArgSvmFixture> KernelArgSvmTest;
 
 TEST_F(KernelArgSvmTest, GivenValidSvmPtrWhenSettingKernelArgThenSvmPtrIsCorrect) {
     char *svmPtr = new char[256];
diff --git a/opencl/test/unit_test/xe_hp_core/xehp/hw_info_tests_xehp.inl b/opencl/test/unit_test/xe_hp_core/xehp/hw_info_tests_xehp.inl
index 9411110504..b4b4a7f21f 100644
--- a/opencl/test/unit_test/xe_hp_core/xehp/hw_info_tests_xehp.inl
+++ b/opencl/test/unit_test/xe_hp_core/xehp/hw_info_tests_xehp.inl
@@ -33,7 +33,7 @@ XEHPTEST_F(XeHPHwInfoTest, whenSetupHardwareInfoWithSetupFeatureTableFlagTrueOrF
     EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated);
     EXPECT_EQ(8u, gtSystemInfo.CsrSizeInMb);
 
-    XE_HP_SDV_CONFIG::setupHardwareInfo(&hwInfo, false);
+    XehpSdvHwConfig::setupHardwareInfo(&hwInfo, false);
     EXPECT_FALSE(featureTable.flags.ftrLocalMemory);
     EXPECT_FALSE(featureTable.flags.ftrFlatPhysCCS);
     EXPECT_FALSE(featureTable.flags.ftrLinearCCS);
@@ -47,7 +47,7 @@ XEHPTEST_F(XeHPHwInfoTest, whenSetupHardwareInfoWithSetupFeatureTableFlagTrueOrF
     EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated);
     EXPECT_EQ(8u, gtSystemInfo.CsrSizeInMb);
 
-    XE_HP_SDV_CONFIG::setupHardwareInfo(&hwInfo, true);
+    XehpSdvHwConfig::setupHardwareInfo(&hwInfo, true);
     EXPECT_TRUE(featureTable.flags.ftrLocalMemory);
     EXPECT_TRUE(featureTable.flags.ftrFlatPhysCCS);
     EXPECT_TRUE(featureTable.flags.ftrLinearCCS);
@@ -67,13 +67,13 @@ XEHPTEST_F(XeHPHwInfoTest, givenAlreadyInitializedHwInfoWhenSetupCalledThenDontO
 
     hwInfo.gtSystemInfo.SliceCount = 0;
 
-    XE_HP_SDV_CONFIG::setupHardwareInfo(&hwInfo, false);
+    XehpSdvHwConfig::setupHardwareInfo(&hwInfo, false);
 
     EXPECT_NE(0u, hwInfo.gtSystemInfo.SliceCount);
 
     auto expectedValue = ++hwInfo.gtSystemInfo.SliceCount;
 
-    XE_HP_SDV_CONFIG::setupHardwareInfo(&hwInfo, false);
+    XehpSdvHwConfig::setupHardwareInfo(&hwInfo, false);
 
     EXPECT_EQ(expectedValue, hwInfo.gtSystemInfo.SliceCount);
 }
diff --git a/opencl/test/unit_test/xe_hp_core/xehp/linux/dll/device_id_tests_xehp.cpp b/opencl/test/unit_test/xe_hp_core/xehp/linux/dll/device_id_tests_xehp.cpp
index 1184b57e3a..155ad289f9 100644
--- a/opencl/test/unit_test/xe_hp_core/xehp/linux/dll/device_id_tests_xehp.cpp
+++ b/opencl/test/unit_test/xe_hp_core/xehp/linux/dll/device_id_tests_xehp.cpp
@@ -10,22 +10,22 @@
 using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenXeHpSdvSupportedDeviceIdThenConfigIsCorrect) {
-    std::array<DeviceDescriptor, 16> expectedDescriptors = {{{0x0201, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x0202, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x0203, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x0204, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x0205, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x0206, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x0207, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x0208, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x0209, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x020A, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x020B, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x020C, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x020D, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x020E, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x020F, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo},
-                                                             {0x0210, &XE_HP_SDV_CONFIG::hwInfo, &XE_HP_SDV_CONFIG::setupHardwareInfo}}};
+    std::array<DeviceDescriptor, 16> expectedDescriptors = {{{0x0201, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x0202, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x0203, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x0204, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x0205, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x0206, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x0207, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x0208, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x0209, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x020A, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x020B, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x020C, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x020D, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x020E, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x020F, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo},
+                                                             {0x0210, &XehpSdvHwConfig::hwInfo, &XehpSdvHwConfig::setupHardwareInfo}}};
 
     testImpl(expectedDescriptors);
 }
diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/linux/dll/device_id_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/linux/dll/device_id_tests_pvc.cpp
index 7a72249ad4..9584561bb0 100644
--- a/opencl/test/unit_test/xe_hpc_core/pvc/linux/dll/device_id_tests_pvc.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/pvc/linux/dll/device_id_tests_pvc.cpp
@@ -11,14 +11,14 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenPvcSupportedDeviceIdThenConfigIsCorrect) {
     std::array<DeviceDescriptor, 8> expectedDescriptors = {{
-        {0x0BD0, &PVC_CONFIG::hwInfo, &PVC_CONFIG::setupHardwareInfo},
-        {0x0BD5, &PVC_CONFIG::hwInfo, &PVC_CONFIG::setupHardwareInfo},
-        {0x0BD6, &PVC_CONFIG::hwInfo, &PVC_CONFIG::setupHardwareInfo},
-        {0x0BD7, &PVC_CONFIG::hwInfo, &PVC_CONFIG::setupHardwareInfo},
-        {0x0BD8, &PVC_CONFIG::hwInfo, &PVC_CONFIG::setupHardwareInfo},
-        {0x0BD9, &PVC_CONFIG::hwInfo, &PVC_CONFIG::setupHardwareInfo},
-        {0x0BDA, &PVC_CONFIG::hwInfo, &PVC_CONFIG::setupHardwareInfo},
-        {0x0BDB, &PVC_CONFIG::hwInfo, &PVC_CONFIG::setupHardwareInfo},
+        {0x0BD0, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
+        {0x0BD5, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
+        {0x0BD6, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
+        {0x0BD7, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
+        {0x0BD8, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
+        {0x0BD9, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
+        {0x0BDA, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
+        {0x0BDB, &PvcHwConfig::hwInfo, &PvcHwConfig::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/opencl/test/unit_test/xe_hpg_core/dg2/linux/dll/device_id_tests_dg2.cpp b/opencl/test/unit_test/xe_hpg_core/dg2/linux/dll/device_id_tests_dg2.cpp
index 9e25cbe219..ebfd855d29 100644
--- a/opencl/test/unit_test/xe_hpg_core/dg2/linux/dll/device_id_tests_dg2.cpp
+++ b/opencl/test/unit_test/xe_hpg_core/dg2/linux/dll/device_id_tests_dg2.cpp
@@ -11,26 +11,26 @@ using namespace NEO;
 
 TEST_F(DeviceIdTests, GivenDg2SupportedDeviceIdThenDeviceDescriptorTableExists) {
     std::array<DeviceDescriptor, 20> expectedDescriptors = {{
-        {0x4F80, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x4F81, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x4F82, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x4F83, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x4F84, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x4F87, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x4F88, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x5690, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x5691, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x5692, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x5693, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x5694, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x5695, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x56A0, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x56A1, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x56A2, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x56A5, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x56A6, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x56C0, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
-        {0x56C1, &DG2_CONFIG::hwInfo, &DG2_CONFIG::setupHardwareInfo},
+        {0x4F80, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x4F81, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x4F82, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x4F83, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x4F84, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x4F87, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x4F88, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x5690, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x5691, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x5692, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x5693, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x5694, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x5695, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x56A0, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x56A1, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x56A2, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x56A5, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x56A6, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x56C0, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
+        {0x56C1, &Dg2HwConfig::hwInfo, &Dg2HwConfig::setupHardwareInfo},
     }};
 
     testImpl(expectedDescriptors);
diff --git a/shared/source/dll/devices/devices_additional.inl b/shared/source/dll/devices/devices_additional.inl
index 1f02b0a965..18fc2f53ad 100644
--- a/shared/source/dll/devices/devices_additional.inl
+++ b/shared/source/dll/devices/devices_additional.inl
@@ -7,68 +7,68 @@
 
 #if SUPPORT_XE_HPC_CORE
 #ifdef SUPPORT_PVC
-DEVICE(0x0BD0, PVC_CONFIG)
-DEVICE(0x0BD5, PVC_CONFIG)
-DEVICE(0x0BD6, PVC_CONFIG)
-DEVICE(0x0BD7, PVC_CONFIG)
-DEVICE(0x0BD8, PVC_CONFIG)
-DEVICE(0x0BD9, PVC_CONFIG)
-DEVICE(0x0BDA, PVC_CONFIG)
-DEVICE(0x0BDB, PVC_CONFIG)
+DEVICE(0x0BD0, PvcHwConfig)
+DEVICE(0x0BD5, PvcHwConfig)
+DEVICE(0x0BD6, PvcHwConfig)
+DEVICE(0x0BD7, PvcHwConfig)
+DEVICE(0x0BD8, PvcHwConfig)
+DEVICE(0x0BD9, PvcHwConfig)
+DEVICE(0x0BDA, PvcHwConfig)
+DEVICE(0x0BDB, PvcHwConfig)
 #endif
 #endif
 
 #ifdef SUPPORT_XE_HPG_CORE
 #ifdef SUPPORT_DG2
-DEVICE(0x4F80, DG2_CONFIG)
-DEVICE(0x4F81, DG2_CONFIG)
-DEVICE(0x4F82, DG2_CONFIG)
-DEVICE(0x4F83, DG2_CONFIG)
-DEVICE(0x4F84, DG2_CONFIG)
-DEVICE(0x4F87, DG2_CONFIG)
-DEVICE(0x4F88, DG2_CONFIG)
-DEVICE(0x5690, DG2_CONFIG)
-DEVICE(0x5691, DG2_CONFIG)
-DEVICE(0x5692, DG2_CONFIG)
-DEVICE(0x5693, DG2_CONFIG)
-DEVICE(0x5694, DG2_CONFIG)
-DEVICE(0x5695, DG2_CONFIG)
-DEVICE(0x56A0, DG2_CONFIG)
-DEVICE(0x56A1, DG2_CONFIG)
-DEVICE(0x56A2, DG2_CONFIG)
-DEVICE(0x56A5, DG2_CONFIG)
-DEVICE(0x56A6, DG2_CONFIG)
-DEVICE(0x56C0, DG2_CONFIG)
-DEVICE(0x56C1, DG2_CONFIG)
+DEVICE(0x4F80, Dg2HwConfig)
+DEVICE(0x4F81, Dg2HwConfig)
+DEVICE(0x4F82, Dg2HwConfig)
+DEVICE(0x4F83, Dg2HwConfig)
+DEVICE(0x4F84, Dg2HwConfig)
+DEVICE(0x4F87, Dg2HwConfig)
+DEVICE(0x4F88, Dg2HwConfig)
+DEVICE(0x5690, Dg2HwConfig)
+DEVICE(0x5691, Dg2HwConfig)
+DEVICE(0x5692, Dg2HwConfig)
+DEVICE(0x5693, Dg2HwConfig)
+DEVICE(0x5694, Dg2HwConfig)
+DEVICE(0x5695, Dg2HwConfig)
+DEVICE(0x56A0, Dg2HwConfig)
+DEVICE(0x56A1, Dg2HwConfig)
+DEVICE(0x56A2, Dg2HwConfig)
+DEVICE(0x56A5, Dg2HwConfig)
+DEVICE(0x56A6, Dg2HwConfig)
+DEVICE(0x56C0, Dg2HwConfig)
+DEVICE(0x56C1, Dg2HwConfig)
 #endif
 #endif
 
 #ifdef SUPPORT_GEN12LP
 #ifdef SUPPORT_ADLP
-DEVICE(0x46A0, ADLP_CONFIG)
-DEVICE(0x46B0, ADLP_CONFIG)
-DEVICE(0x46A1, ADLP_CONFIG)
-DEVICE(0x46A2, ADLP_CONFIG)
-DEVICE(0x46A3, ADLP_CONFIG)
-DEVICE(0x46A6, ADLP_CONFIG)
-DEVICE(0x46A8, ADLP_CONFIG)
-DEVICE(0x46AA, ADLP_CONFIG)
-DEVICE(0x462A, ADLP_CONFIG)
-DEVICE(0x4626, ADLP_CONFIG)
-DEVICE(0x4628, ADLP_CONFIG)
-DEVICE(0x46B1, ADLP_CONFIG)
-DEVICE(0x46B2, ADLP_CONFIG)
-DEVICE(0x46B3, ADLP_CONFIG)
-DEVICE(0x46C0, ADLP_CONFIG)
-DEVICE(0x46C1, ADLP_CONFIG)
-DEVICE(0x46C2, ADLP_CONFIG)
-DEVICE(0x46C3, ADLP_CONFIG)
+DEVICE(0x46A0, AdlpHwConfig)
+DEVICE(0x46B0, AdlpHwConfig)
+DEVICE(0x46A1, AdlpHwConfig)
+DEVICE(0x46A2, AdlpHwConfig)
+DEVICE(0x46A3, AdlpHwConfig)
+DEVICE(0x46A6, AdlpHwConfig)
+DEVICE(0x46A8, AdlpHwConfig)
+DEVICE(0x46AA, AdlpHwConfig)
+DEVICE(0x462A, AdlpHwConfig)
+DEVICE(0x4626, AdlpHwConfig)
+DEVICE(0x4628, AdlpHwConfig)
+DEVICE(0x46B1, AdlpHwConfig)
+DEVICE(0x46B2, AdlpHwConfig)
+DEVICE(0x46B3, AdlpHwConfig)
+DEVICE(0x46C0, AdlpHwConfig)
+DEVICE(0x46C1, AdlpHwConfig)
+DEVICE(0x46C2, AdlpHwConfig)
+DEVICE(0x46C3, AdlpHwConfig)
 // RPL-P
-DEVICE(0xA7A0, ADLP_CONFIG)
-DEVICE(0xA720, ADLP_CONFIG)
-DEVICE(0xA7A8, ADLP_CONFIG)
-DEVICE(0xA7A1, ADLP_CONFIG)
-DEVICE(0xA721, ADLP_CONFIG)
-DEVICE(0xA7A9, ADLP_CONFIG)
+DEVICE(0xA7A0, AdlpHwConfig)
+DEVICE(0xA720, AdlpHwConfig)
+DEVICE(0xA7A8, AdlpHwConfig)
+DEVICE(0xA7A1, AdlpHwConfig)
+DEVICE(0xA721, AdlpHwConfig)
+DEVICE(0xA7A9, AdlpHwConfig)
 #endif
 #endif
diff --git a/shared/source/dll/devices/devices_base.inl b/shared/source/dll/devices/devices_base.inl
index 7b2dbe6cfe..2ca88c211d 100644
--- a/shared/source/dll/devices/devices_base.inl
+++ b/shared/source/dll/devices/devices_base.inl
@@ -8,72 +8,72 @@
 // clang-format off
 #ifdef SUPPORT_XE_HP_CORE
 #ifdef SUPPORT_XE_HP_SDV
-DEVICE(0x0201, XE_HP_SDV_CONFIG)
-DEVICE(0x0202, XE_HP_SDV_CONFIG)
-DEVICE(0x0203, XE_HP_SDV_CONFIG)
-DEVICE(0x0204, XE_HP_SDV_CONFIG)
-DEVICE(0x0205, XE_HP_SDV_CONFIG)
-DEVICE(0x0206, XE_HP_SDV_CONFIG)
-DEVICE(0x0207, XE_HP_SDV_CONFIG)
-DEVICE(0x0208, XE_HP_SDV_CONFIG)
-DEVICE(0x0209, XE_HP_SDV_CONFIG)
-DEVICE(0x020A, XE_HP_SDV_CONFIG)
-DEVICE(0x020B, XE_HP_SDV_CONFIG)
-DEVICE(0x020C, XE_HP_SDV_CONFIG)
-DEVICE(0x020D, XE_HP_SDV_CONFIG)
-DEVICE(0x020E, XE_HP_SDV_CONFIG)
-DEVICE(0x020F, XE_HP_SDV_CONFIG)
-DEVICE(0x0210, XE_HP_SDV_CONFIG)
+DEVICE(0x0201, XehpSdvHwConfig)
+DEVICE(0x0202, XehpSdvHwConfig)
+DEVICE(0x0203, XehpSdvHwConfig)
+DEVICE(0x0204, XehpSdvHwConfig)
+DEVICE(0x0205, XehpSdvHwConfig)
+DEVICE(0x0206, XehpSdvHwConfig)
+DEVICE(0x0207, XehpSdvHwConfig)
+DEVICE(0x0208, XehpSdvHwConfig)
+DEVICE(0x0209, XehpSdvHwConfig)
+DEVICE(0x020A, XehpSdvHwConfig)
+DEVICE(0x020B, XehpSdvHwConfig)
+DEVICE(0x020C, XehpSdvHwConfig)
+DEVICE(0x020D, XehpSdvHwConfig)
+DEVICE(0x020E, XehpSdvHwConfig)
+DEVICE(0x020F, XehpSdvHwConfig)
+DEVICE(0x0210, XehpSdvHwConfig)
 #endif
 #endif
 
 #ifdef SUPPORT_GEN12LP
 
 #ifdef SUPPORT_TGLLP
-DEVICE( 0xFF20, TGLLP_1x6x16 )
-NAMEDDEVICE( 0x9A49, TGLLP_1x6x16, "Intel(R) Iris(R) Xe Graphics" )
-NAMEDDEVICE( 0x9A40, TGLLP_1x6x16, "Intel(R) Iris(R) Xe Graphics" )
-DEVICE( 0x9A59, TGLLP_1x6x16 )
-NAMEDDEVICE( 0x9A60, TGLLP_1x2x16, "Intel(R) UHD Graphics" )
-NAMEDDEVICE( 0x9A68, TGLLP_1x2x16, "Intel(R) UHD Graphics" )
-NAMEDDEVICE( 0x9A70, TGLLP_1x2x16, "Intel(R) UHD Graphics" )
-NAMEDDEVICE( 0x9A78, TGLLP_1x2x16, "Intel(R) UHD Graphics" )
+DEVICE( 0xFF20, TgllpHw1x6x16 )
+NAMEDDEVICE( 0x9A49, TgllpHw1x6x16, "Intel(R) Iris(R) Xe Graphics" )
+NAMEDDEVICE( 0x9A40, TgllpHw1x6x16, "Intel(R) Iris(R) Xe Graphics" )
+DEVICE( 0x9A59, TgllpHw1x6x16 )
+NAMEDDEVICE( 0x9A60, TgllpHw1x2x16, "Intel(R) UHD Graphics" )
+NAMEDDEVICE( 0x9A68, TgllpHw1x2x16, "Intel(R) UHD Graphics" )
+NAMEDDEVICE( 0x9A70, TgllpHw1x2x16, "Intel(R) UHD Graphics" )
+NAMEDDEVICE( 0x9A78, TgllpHw1x2x16, "Intel(R) UHD Graphics" )
 #endif
 
 #ifdef SUPPORT_DG1
-NAMEDDEVICE( 0x4905, DG1_CONFIG, "Intel(R) Iris(R) Xe MAX Graphics" )
-DEVICE( 0x4906, DG1_CONFIG )
-NAMEDDEVICE( 0x4907, DG1_CONFIG, "Intel(R) Server GPU SG-18M" )
-NAMEDDEVICE( 0x4908, DG1_CONFIG, "Intel(R) Iris(R) Xe Graphics" )
+NAMEDDEVICE( 0x4905, Dg1HwConfig, "Intel(R) Iris(R) Xe MAX Graphics" )
+DEVICE( 0x4906, Dg1HwConfig )
+NAMEDDEVICE( 0x4907, Dg1HwConfig, "Intel(R) Server GPU SG-18M" )
+NAMEDDEVICE( 0x4908, Dg1HwConfig, "Intel(R) Iris(R) Xe Graphics" )
 #endif
 
 #ifdef SUPPORT_RKL
-DEVICE( 0x4C80, RKL_HW_CONFIG )
-NAMEDDEVICE( 0x4C8A, RKL_HW_CONFIG, "Intel(R) UHD Graphics 750" )
-NAMEDDEVICE( 0x4C8B, RKL_HW_CONFIG, "Intel(R) UHD Graphics 730" )
-DEVICE( 0x4C8C, RKL_HW_CONFIG )
-NAMEDDEVICE( 0x4C90, RKL_HW_CONFIG, "Intel(R) UHD Graphics P750" )
-DEVICE( 0x4C9A, RKL_HW_CONFIG )
+DEVICE( 0x4C80, RklHwConfig )
+NAMEDDEVICE( 0x4C8A, RklHwConfig, "Intel(R) UHD Graphics 750" )
+NAMEDDEVICE( 0x4C8B, RklHwConfig, "Intel(R) UHD Graphics 730" )
+DEVICE( 0x4C8C, RklHwConfig )
+NAMEDDEVICE( 0x4C90, RklHwConfig, "Intel(R) UHD Graphics P750" )
+DEVICE( 0x4C9A, RklHwConfig )
 #endif
 
 #ifdef SUPPORT_ADLS
-NAMEDDEVICE( 0x4680, ADLS_HW_CONFIG, "Intel(R) UHD Graphics 770" )
-NAMEDDEVICE( 0x4682, ADLS_HW_CONFIG, "Intel(R) UHD Graphics 730" )
-DEVICE( 0x4688, ADLS_HW_CONFIG )
-DEVICE( 0x468A, ADLS_HW_CONFIG )
-NAMEDDEVICE( 0x4690, ADLS_HW_CONFIG, "Intel(R) UHD Graphics 770" )
-NAMEDDEVICE( 0x4692, ADLS_HW_CONFIG, "Intel(R) UHD Graphics 730" )
-NAMEDDEVICE( 0x4693, ADLS_HW_CONFIG, "Intel(R) UHD Graphics 710" )
-DEVICE( 0xA780, ADLS_HW_CONFIG )
-DEVICE( 0xA781, ADLS_HW_CONFIG )
-DEVICE( 0xA782, ADLS_HW_CONFIG )
-DEVICE( 0xA783, ADLS_HW_CONFIG )
-DEVICE( 0xA788, ADLS_HW_CONFIG )
-DEVICE( 0xA789, ADLS_HW_CONFIG )
+NAMEDDEVICE( 0x4680, AdlsHwConfig, "Intel(R) UHD Graphics 770" )
+NAMEDDEVICE( 0x4682, AdlsHwConfig, "Intel(R) UHD Graphics 730" )
+DEVICE( 0x4688, AdlsHwConfig )
+DEVICE( 0x468A, AdlsHwConfig )
+NAMEDDEVICE( 0x4690, AdlsHwConfig, "Intel(R) UHD Graphics 770" )
+NAMEDDEVICE( 0x4692, AdlsHwConfig, "Intel(R) UHD Graphics 730" )
+NAMEDDEVICE( 0x4693, AdlsHwConfig, "Intel(R) UHD Graphics 710" )
+DEVICE( 0xA780, AdlsHwConfig )
+DEVICE( 0xA781, AdlsHwConfig )
+DEVICE( 0xA782, AdlsHwConfig )
+DEVICE( 0xA783, AdlsHwConfig )
+DEVICE( 0xA788, AdlsHwConfig )
+DEVICE( 0xA789, AdlsHwConfig )
 #endif
 
 #ifdef SUPPORT_ADLN
-DEVICE(0x46D0, ADLN_CONFIG)
+DEVICE(0x46D0, AdlnHwConfig)
 #endif
 
 #endif
@@ -81,172 +81,172 @@ DEVICE(0x46D0, ADLN_CONFIG)
 #ifdef SUPPORT_GEN11
 
 #ifdef SUPPORT_ICLLP
-DEVICE( 0xFF05, ICLLP_1x4x8 )
-NAMEDDEVICE( 0x8A56, ICLLP_1x4x8, "Intel(R) UHD Graphics" )
-NAMEDDEVICE( 0x8A58, ICLLP_1x4x8, "Intel(R) UHD Graphics" )
-NAMEDDEVICE( 0x8A5C, ICLLP_1x6x8, "Intel(R) Iris(R) Plus Graphics" )
-NAMEDDEVICE( 0x8A5A, ICLLP_1x6x8, "Intel(R) Iris(R) Plus Graphics" )
-DEVICE( 0x8A50, ICLLP_1x8x8 )
-NAMEDDEVICE( 0x8A52, ICLLP_1x8x8, "Intel(R) Iris(R) Plus Graphics" )
-NAMEDDEVICE( 0x8A51, ICLLP_1x8x8, "Intel(R) Iris(R) Plus Graphics" )
+DEVICE( 0xFF05, IcllpHw1x4x8 )
+NAMEDDEVICE( 0x8A56, IcllpHw1x4x8, "Intel(R) UHD Graphics" )
+NAMEDDEVICE( 0x8A58, IcllpHw1x4x8, "Intel(R) UHD Graphics" )
+NAMEDDEVICE( 0x8A5C, IcllpHw1x6x8, "Intel(R) Iris(R) Plus Graphics" )
+NAMEDDEVICE( 0x8A5A, IcllpHw1x6x8, "Intel(R) Iris(R) Plus Graphics" )
+DEVICE( 0x8A50, IcllpHw1x8x8 )
+NAMEDDEVICE( 0x8A52, IcllpHw1x8x8, "Intel(R) Iris(R) Plus Graphics" )
+NAMEDDEVICE( 0x8A51, IcllpHw1x8x8, "Intel(R) Iris(R) Plus Graphics" )
 #endif
 
 #ifdef SUPPORT_LKF
-NAMEDDEVICE( 0x9840, LKF_1x8x8, "Intel(R) UHD Graphics" )
+NAMEDDEVICE( 0x9840, LkfHw1x8x8, "Intel(R) UHD Graphics" )
 #endif
 
 #ifdef SUPPORT_EHL
-DEVICE( 0x4500, EHL_HW_CONFIG )
-DEVICE( 0x4541, EHL_HW_CONFIG )
-DEVICE( 0x4551, EHL_HW_CONFIG )
-NAMEDDEVICE( 0x4571, EHL_HW_CONFIG, "Intel(R) UHD Graphics" )
-NAMEDDEVICE( 0x4555, EHL_HW_CONFIG, "Intel(R) UHD Graphics" )
-DEVICE( 0x4E51, EHL_HW_CONFIG )
-NAMEDDEVICE( 0x4E61, EHL_HW_CONFIG, "Intel(R) UHD Graphics" )
-NAMEDDEVICE( 0x4E71, EHL_HW_CONFIG, "Intel(R) UHD Graphics" )
-NAMEDDEVICE( 0x4E55, EHL_HW_CONFIG, "Intel(R) UHD Graphics" )
+DEVICE( 0x4500, EhlHwConfig )
+DEVICE( 0x4541, EhlHwConfig )
+DEVICE( 0x4551, EhlHwConfig )
+NAMEDDEVICE( 0x4571, EhlHwConfig, "Intel(R) UHD Graphics" )
+NAMEDDEVICE( 0x4555, EhlHwConfig, "Intel(R) UHD Graphics" )
+DEVICE( 0x4E51, EhlHwConfig )
+NAMEDDEVICE( 0x4E61, EhlHwConfig, "Intel(R) UHD Graphics" )
+NAMEDDEVICE( 0x4E71, EhlHwConfig, "Intel(R) UHD Graphics" )
+NAMEDDEVICE( 0x4E55, EhlHwConfig, "Intel(R) UHD Graphics" )
 #endif
 #endif
 
 #ifdef SUPPORT_GEN9
 
 #ifdef SUPPORT_SKL
-NAMEDDEVICE( 0x1902, SKL_1x2x6, "Intel(R) HD Graphics 510" )
-NAMEDDEVICE( 0x190B, SKL_1x2x6, "Intel(R) HD Graphics 510" )
-DEVICE( 0x190A, SKL_1x2x6 )
-NAMEDDEVICE( 0x1906, SKL_1x2x6, "Intel(R) HD Graphics 510" )
-DEVICE( 0x190E, SKL_1x2x6 )
-DEVICE( 0x1917, SKL_1x3x6 )
-DEVICE( 0x1913, SKL_1x3x6 )
-DEVICE( 0X1915, SKL_1x3x6 )
-NAMEDDEVICE( 0x1912, SKL_1x3x8, "Intel(R) HD Graphics 530" )
-NAMEDDEVICE( 0x191B, SKL_1x3x8, "Intel(R) HD Graphics 530" )
-DEVICE( 0x191A, SKL_1x3x8 )
-NAMEDDEVICE( 0x1916, SKL_1x3x8, "Intel(R) HD Graphics 520" )
-NAMEDDEVICE( 0x191E, SKL_1x3x8, "Intel(R) HD Graphics 515" )
-NAMEDDEVICE( 0x191D, SKL_1x3x8, "Intel(R) HD Graphics P530" )
-NAMEDDEVICE( 0x1921, SKL_1x3x8, "Intel(R) HD Graphics 520" )
-DEVICE( 0x9905, SKL_1x3x8 )
-NAMEDDEVICE( 0x192B, SKL_2x3x8, "Intel(R) Iris(R) Graphics 555" )
-NAMEDDEVICE( 0x192D, SKL_2x3x8, "Intel(R) Iris(R) Graphics P555" )
-DEVICE( 0x192A, SKL_2x3x8 )
-NAMEDDEVICE( 0x1923, SKL_2x3x8, "Intel(R) HD Graphics 535" )
-NAMEDDEVICE( 0x1926, SKL_2x3x8, "Intel(R) Iris(R) Graphics 540" )
-NAMEDDEVICE( 0x1927, SKL_2x3x8, "Intel(R) Iris(R) Graphics 550" )
-DEVICE( 0x1932, SKL_3x3x8 )
-NAMEDDEVICE( 0x193B, SKL_3x3x8, "Intel(R) Iris(R) Pro Graphics 580" )
-NAMEDDEVICE( 0x193A, SKL_3x3x8, "Intel(R) Iris(R) Pro Graphics P580" )
-NAMEDDEVICE( 0x193D, SKL_3x3x8, "Intel(R) Iris(R) Pro Graphics P580" )
+NAMEDDEVICE( 0x1902, SklHw1x2x6, "Intel(R) HD Graphics 510" )
+NAMEDDEVICE( 0x190B, SklHw1x2x6, "Intel(R) HD Graphics 510" )
+DEVICE( 0x190A, SklHw1x2x6 )
+NAMEDDEVICE( 0x1906, SklHw1x2x6, "Intel(R) HD Graphics 510" )
+DEVICE( 0x190E, SklHw1x2x6 )
+DEVICE( 0x1917, SklHw1x3x6 )
+DEVICE( 0x1913, SklHw1x3x6 )
+DEVICE( 0X1915, SklHw1x3x6 )
+NAMEDDEVICE( 0x1912, SklHw1x3x8, "Intel(R) HD Graphics 530" )
+NAMEDDEVICE( 0x191B, SklHw1x3x8, "Intel(R) HD Graphics 530" )
+DEVICE( 0x191A, SklHw1x3x8 )
+NAMEDDEVICE( 0x1916, SklHw1x3x8, "Intel(R) HD Graphics 520" )
+NAMEDDEVICE( 0x191E, SklHw1x3x8, "Intel(R) HD Graphics 515" )
+NAMEDDEVICE( 0x191D, SklHw1x3x8, "Intel(R) HD Graphics P530" )
+NAMEDDEVICE( 0x1921, SklHw1x3x8, "Intel(R) HD Graphics 520" )
+DEVICE( 0x9905, SklHw1x3x8 )
+NAMEDDEVICE( 0x192B, SklHw2x3x8, "Intel(R) Iris(R) Graphics 555" )
+NAMEDDEVICE( 0x192D, SklHw2x3x8, "Intel(R) Iris(R) Graphics P555" )
+DEVICE( 0x192A, SklHw2x3x8 )
+NAMEDDEVICE( 0x1923, SklHw2x3x8, "Intel(R) HD Graphics 535" )
+NAMEDDEVICE( 0x1926, SklHw2x3x8, "Intel(R) Iris(R) Graphics 540" )
+NAMEDDEVICE( 0x1927, SklHw2x3x8, "Intel(R) Iris(R) Graphics 550" )
+DEVICE( 0x1932, SklHw3x3x8 )
+NAMEDDEVICE( 0x193B, SklHw3x3x8, "Intel(R) Iris(R) Pro Graphics 580" )
+NAMEDDEVICE( 0x193A, SklHw3x3x8, "Intel(R) Iris(R) Pro Graphics P580" )
+NAMEDDEVICE( 0x193D, SklHw3x3x8, "Intel(R) Iris(R) Pro Graphics P580" )
 #endif
 
 #ifdef SUPPORT_KBL
-NAMEDDEVICE( 0x5902, KBL_1x2x6, "Intel(R) HD Graphics 610" )
-NAMEDDEVICE( 0x590B, KBL_1x2x6, "Intel(R) HD Graphics 610" )
-DEVICE( 0x590A, KBL_1x2x6 )
-NAMEDDEVICE( 0x5906, KBL_1x2x6, "Intel(R) HD Graphics 610" )
-DEVICE( 0x590E, KBL_1x3x6 )
-DEVICE( 0x5908, KBL_1x2x6 )
-DEVICE( 0x5913, KBL_1x3x6 )
-DEVICE( 0x5915, KBL_1x2x6 )
-NAMEDDEVICE( 0x5912, KBL_1x3x8, "Intel(R) HD Graphics 630" )
-NAMEDDEVICE( 0x591B, KBL_1x3x8, "Intel(R) HD Graphics 630" )
-NAMEDDEVICE( 0x5917, KBL_1x3x8, "Intel(R) UHD Graphics 620" )
-DEVICE( 0x591A, KBL_1x3x8 )
-NAMEDDEVICE( 0x5916, KBL_1x3x8, "Intel(R) HD Graphics 620" )
-NAMEDDEVICE( 0x591E, KBL_1x3x8, "Intel(R) HD Graphics 615" )
-NAMEDDEVICE( 0x591D, KBL_1x3x8, "Intel(R) HD Graphics P630" )
-NAMEDDEVICE( 0x591C, KBL_1x3x8, "Intel(R) UHD Graphics 615" )
-NAMEDDEVICE( 0x5921, KBL_1x3x8, "Intel(R) HD Graphics 620" )
-NAMEDDEVICE( 0x5926, KBL_2x3x8, "Intel(R) Iris(R) Plus Graphics 640" )
-NAMEDDEVICE( 0x5927, KBL_2x3x8, "Intel(R) Iris(R) Plus Graphics 650" )
-DEVICE( 0x592B, KBL_2x3x8 )
-DEVICE( 0x592A, KBL_2x3x8 )
-DEVICE( 0x5923, KBL_2x3x8 )
-DEVICE( 0x5932, KBL_3x3x8 )
-DEVICE( 0x593B, KBL_3x3x8 )
-DEVICE( 0x593A, KBL_3x3x8 )
-DEVICE( 0x593D, KBL_3x3x8 )
+NAMEDDEVICE( 0x5902, KblHw1x2x6, "Intel(R) HD Graphics 610" )
+NAMEDDEVICE( 0x590B, KblHw1x2x6, "Intel(R) HD Graphics 610" )
+DEVICE( 0x590A, KblHw1x2x6 )
+NAMEDDEVICE( 0x5906, KblHw1x2x6, "Intel(R) HD Graphics 610" )
+DEVICE( 0x590E, KblHw1x3x6 )
+DEVICE( 0x5908, KblHw1x2x6 )
+DEVICE( 0x5913, KblHw1x3x6 )
+DEVICE( 0x5915, KblHw1x2x6 )
+NAMEDDEVICE( 0x5912, KblHw1x3x8, "Intel(R) HD Graphics 630" )
+NAMEDDEVICE( 0x591B, KblHw1x3x8, "Intel(R) HD Graphics 630" )
+NAMEDDEVICE( 0x5917, KblHw1x3x8, "Intel(R) UHD Graphics 620" )
+DEVICE( 0x591A, KblHw1x3x8 )
+NAMEDDEVICE( 0x5916, KblHw1x3x8, "Intel(R) HD Graphics 620" )
+NAMEDDEVICE( 0x591E, KblHw1x3x8, "Intel(R) HD Graphics 615" )
+NAMEDDEVICE( 0x591D, KblHw1x3x8, "Intel(R) HD Graphics P630" )
+NAMEDDEVICE( 0x591C, KblHw1x3x8, "Intel(R) UHD Graphics 615" )
+NAMEDDEVICE( 0x5921, KblHw1x3x8, "Intel(R) HD Graphics 620" )
+NAMEDDEVICE( 0x5926, KblHw2x3x8, "Intel(R) Iris(R) Plus Graphics 640" )
+NAMEDDEVICE( 0x5927, KblHw2x3x8, "Intel(R) Iris(R) Plus Graphics 650" )
+DEVICE( 0x592B, KblHw2x3x8 )
+DEVICE( 0x592A, KblHw2x3x8 )
+DEVICE( 0x5923, KblHw2x3x8 )
+DEVICE( 0x5932, KblHw3x3x8 )
+DEVICE( 0x593B, KblHw3x3x8 )
+DEVICE( 0x593A, KblHw3x3x8 )
+DEVICE( 0x593D, KblHw3x3x8 )
 #endif
 
 #ifdef SUPPORT_CFL
-NAMEDDEVICE( 0x3E90, CFL_1x2x6, "Intel(R) UHD Graphics 610" )
-NAMEDDEVICE( 0x3E93, CFL_1x2x6, "Intel(R) UHD Graphics 610" )
-DEVICE( 0x3EA4, CFL_1x2x6 )
-DEVICE( 0x3E99, CFL_1x2x6 )
-NAMEDDEVICE( 0x3EA1, CFL_1x2x6, "Intel(R) UHD Graphics 610" )
-NAMEDDEVICE( 0x3E92, CFL_1x3x8, "Intel(R) UHD Graphics 630" )
-NAMEDDEVICE( 0x3E9B, CFL_1x3x8, "Intel(R) UHD Graphics 630" )
-NAMEDDEVICE( 0x3E94, CFL_1x3x8, "Intel(R) UHD Graphics P630" )
-NAMEDDEVICE( 0x3E91, CFL_1x3x8, "Intel(R) UHD Graphics 630" )
-NAMEDDEVICE( 0x3E96, CFL_1x3x8, "Intel(R) UHD Graphics P630" )
-NAMEDDEVICE( 0x3E9A, CFL_1x3x8, "Intel(R) UHD Graphics P630" )
-DEVICE( 0x3EA3, CFL_1x3x8 )
-NAMEDDEVICE( 0x3EA9, CFL_1x3x8, "Intel(R) UHD Graphics 620" )
-NAMEDDEVICE( 0x3EA0, CFL_1x3x8, "Intel(R) UHD Graphics 620" )
-NAMEDDEVICE( 0x3E98, CFL_1x3x8, "Intel(R) UHD Graphics 630" )
-DEVICE( 0x3E95, CFL_2x3x8 )
-NAMEDDEVICE( 0x3EA6, CFL_2x3x8, "Intel(R) Iris(R) Plus Graphics 645" )
-DEVICE( 0x3EA7, CFL_2x3x8 )
-NAMEDDEVICE( 0x3EA8, CFL_2x3x8, "Intel(R) Iris(R) Plus Graphics 655" )
-NAMEDDEVICE( 0x3EA5, CFL_2x3x8, "Intel(R) Iris(R) Plus Graphics 655" )
-DEVICE( 0x3EA2, CFL_2x3x8 )
-NAMEDDEVICE( 0x9B21, CFL_1x2x6, "Intel(R) UHD Graphics" )
-NAMEDDEVICE( 0x9BAA, CFL_1x2x6, "Intel(R) UHD Graphics" )
-DEVICE( 0x9BAB, CFL_1x2x6 )
-NAMEDDEVICE( 0x9BAC, CFL_1x2x6, "Intel(R) UHD Graphics" )
-DEVICE( 0x9BA0, CFL_1x2x6 )
-DEVICE( 0x9BA5, CFL_1x2x6 )
-NAMEDDEVICE( 0x9BA8, CFL_1x2x6, "Intel(R) UHD Graphics 610" )
-DEVICE( 0x9BA4, CFL_1x2x6 )
-DEVICE( 0x9BA2, CFL_1x2x6 )
-NAMEDDEVICE( 0x9B41, CFL_1x3x8, "Intel(R) UHD Graphics" )
-NAMEDDEVICE( 0x9BCA, CFL_1x3x8, "Intel(R) UHD Graphics" )
-DEVICE( 0x9BCB, CFL_1x3x8 )
-NAMEDDEVICE( 0x9BCC, CFL_1x3x8, "Intel(R) UHD Graphics" )
-DEVICE( 0x9BC0, CFL_1x3x8 )
-NAMEDDEVICE( 0x9BC5, CFL_1x3x8, "Intel(R) UHD Graphics 630" )
-NAMEDDEVICE( 0x9BC8, CFL_1x3x8, "Intel(R) UHD Graphics 630" )
-NAMEDDEVICE( 0x9BC4, CFL_1x3x8, "Intel(R) UHD Graphics" )
-DEVICE( 0x9BC2, CFL_1x3x8 )
-NAMEDDEVICE( 0x9BC6, CFL_1x3x8, "Intel(R) UHD Graphics P630" )
-NAMEDDEVICE( 0x9BE6, CFL_1x3x8, "Intel(R) UHD Graphics P630" )
-NAMEDDEVICE( 0x9BF6, CFL_1x3x8, "Intel(R) UHD Graphics P630" )
+NAMEDDEVICE( 0x3E90, CflHw1x2x6, "Intel(R) UHD Graphics 610" )
+NAMEDDEVICE( 0x3E93, CflHw1x2x6, "Intel(R) UHD Graphics 610" )
+DEVICE( 0x3EA4, CflHw1x2x6 )
+DEVICE( 0x3E99, CflHw1x2x6 )
+NAMEDDEVICE( 0x3EA1, CflHw1x2x6, "Intel(R) UHD Graphics 610" )
+NAMEDDEVICE( 0x3E92, CflHw1x3x8, "Intel(R) UHD Graphics 630" )
+NAMEDDEVICE( 0x3E9B, CflHw1x3x8, "Intel(R) UHD Graphics 630" )
+NAMEDDEVICE( 0x3E94, CflHw1x3x8, "Intel(R) UHD Graphics P630" )
+NAMEDDEVICE( 0x3E91, CflHw1x3x8, "Intel(R) UHD Graphics 630" )
+NAMEDDEVICE( 0x3E96, CflHw1x3x8, "Intel(R) UHD Graphics P630" )
+NAMEDDEVICE( 0x3E9A, CflHw1x3x8, "Intel(R) UHD Graphics P630" )
+DEVICE( 0x3EA3, CflHw1x3x8 )
+NAMEDDEVICE( 0x3EA9, CflHw1x3x8, "Intel(R) UHD Graphics 620" )
+NAMEDDEVICE( 0x3EA0, CflHw1x3x8, "Intel(R) UHD Graphics 620" )
+NAMEDDEVICE( 0x3E98, CflHw1x3x8, "Intel(R) UHD Graphics 630" )
+DEVICE( 0x3E95, CflHw2x3x8 )
+NAMEDDEVICE( 0x3EA6, CflHw2x3x8, "Intel(R) Iris(R) Plus Graphics 645" )
+DEVICE( 0x3EA7, CflHw2x3x8 )
+NAMEDDEVICE( 0x3EA8, CflHw2x3x8, "Intel(R) Iris(R) Plus Graphics 655" )
+NAMEDDEVICE( 0x3EA5, CflHw2x3x8, "Intel(R) Iris(R) Plus Graphics 655" )
+DEVICE( 0x3EA2, CflHw2x3x8 )
+NAMEDDEVICE( 0x9B21, CflHw1x2x6, "Intel(R) UHD Graphics" )
+NAMEDDEVICE( 0x9BAA, CflHw1x2x6, "Intel(R) UHD Graphics" )
+DEVICE( 0x9BAB, CflHw1x2x6 )
+NAMEDDEVICE( 0x9BAC, CflHw1x2x6, "Intel(R) UHD Graphics" )
+DEVICE( 0x9BA0, CflHw1x2x6 )
+DEVICE( 0x9BA5, CflHw1x2x6 )
+NAMEDDEVICE( 0x9BA8, CflHw1x2x6, "Intel(R) UHD Graphics 610" )
+DEVICE( 0x9BA4, CflHw1x2x6 )
+DEVICE( 0x9BA2, CflHw1x2x6 )
+NAMEDDEVICE( 0x9B41, CflHw1x3x8, "Intel(R) UHD Graphics" )
+NAMEDDEVICE( 0x9BCA, CflHw1x3x8, "Intel(R) UHD Graphics" )
+DEVICE( 0x9BCB, CflHw1x3x8 )
+NAMEDDEVICE( 0x9BCC, CflHw1x3x8, "Intel(R) UHD Graphics" )
+DEVICE( 0x9BC0, CflHw1x3x8 )
+NAMEDDEVICE( 0x9BC5, CflHw1x3x8, "Intel(R) UHD Graphics 630" )
+NAMEDDEVICE( 0x9BC8, CflHw1x3x8, "Intel(R) UHD Graphics 630" )
+NAMEDDEVICE( 0x9BC4, CflHw1x3x8, "Intel(R) UHD Graphics" )
+DEVICE( 0x9BC2, CflHw1x3x8 )
+NAMEDDEVICE( 0x9BC6, CflHw1x3x8, "Intel(R) UHD Graphics P630" )
+NAMEDDEVICE( 0x9BE6, CflHw1x3x8, "Intel(R) UHD Graphics P630" )
+NAMEDDEVICE( 0x9BF6, CflHw1x3x8, "Intel(R) UHD Graphics P630" )
 #endif
 
 #ifdef SUPPORT_GLK
-NAMEDDEVICE( 0x3184, GLK_1x3x6, "Intel(R) UHD Graphics 605" )
-NAMEDDEVICE( 0x3185, GLK_1x2x6, "Intel(R) UHD Graphics 600" )
+NAMEDDEVICE( 0x3184, GlkHw1x3x6, "Intel(R) UHD Graphics 605" )
+NAMEDDEVICE( 0x3185, GlkHw1x2x6, "Intel(R) UHD Graphics 600" )
 #endif
 
 #ifdef SUPPORT_BXT
-DEVICE( 0x9906, BXT_1x3x6)
-DEVICE( 0x9907, BXT_1x3x6)
-DEVICE( 0x0A84, BXT_1x3x6)
-NAMEDDEVICE( 0x5A84, BXT_1x3x6, "Intel(R) HD Graphics 505" )
-NAMEDDEVICE( 0x5A85, BXT_1x2x6, "Intel(R) HD Graphics 500" )
-DEVICE( 0x1A85, BXT_1x2x6)
-DEVICE( 0x1A84, BXT_1x3x6)
-DEVICE( 0x9908, BXT_1x3x6)
+DEVICE( 0x9906, BxtHw1x3x6)
+DEVICE( 0x9907, BxtHw1x3x6)
+DEVICE( 0x0A84, BxtHw1x3x6)
+NAMEDDEVICE( 0x5A84, BxtHw1x3x6, "Intel(R) HD Graphics 505" )
+NAMEDDEVICE( 0x5A85, BxtHw1x2x6, "Intel(R) HD Graphics 500" )
+DEVICE( 0x1A85, BxtHw1x2x6)
+DEVICE( 0x1A84, BxtHw1x3x6)
+DEVICE( 0x9908, BxtHw1x3x6)
 #endif
 #endif
 
 #ifdef SUPPORT_GEN8
 
-DEVICE( 0x1602, BDW_1x2x6 )
-DEVICE( 0x160A, BDW_1x2x6 )
-DEVICE( 0x1606, BDW_1x2x6 )
-NAMEDDEVICE( 0x160E, BDW_1x2x6, "Intel(R) HD Graphics" )
-DEVICE( 0x160D, BDW_1x2x6 )
-NAMEDDEVICE( 0x1612, BDW_1x3x8, "Intel(R) HD Graphics 5600" )
-NAMEDDEVICE( 0x161A, BDW_1x3x8, "Intel(R) HD Graphics P5700" )
-NAMEDDEVICE( 0x1616, BDW_1x3x8, "Intel(R) HD Graphics 5500" )
-NAMEDDEVICE( 0x161E, BDW_1x3x8, "Intel(R) HD Graphics 5300" )
-DEVICE( 0x161D, BDW_1x3x8 )
-DEVICE( 0x1622, BDW_2x3x8 )
-NAMEDDEVICE( 0x162A, BDW_2x3x8, "Intel(R) Iris(TM) Pro Graphics P6300" )
-NAMEDDEVICE( 0x1626, BDW_2x3x8, "Intel(R) HD Graphics 6000" )
-DEVICE( 0x162B, BDW_2x3x8 )
-DEVICE( 0x162E, BDW_2x3x8 )
-DEVICE( 0x162D, BDW_2x3x8 )
+DEVICE( 0x1602, BdwHw1x2x6 )
+DEVICE( 0x160A, BdwHw1x2x6 )
+DEVICE( 0x1606, BdwHw1x2x6 )
+NAMEDDEVICE( 0x160E, BdwHw1x2x6, "Intel(R) HD Graphics" )
+DEVICE( 0x160D, BdwHw1x2x6 )
+NAMEDDEVICE( 0x1612, BdwHw1x3x8, "Intel(R) HD Graphics 5600" )
+NAMEDDEVICE( 0x161A, BdwHw1x3x8, "Intel(R) HD Graphics P5700" )
+NAMEDDEVICE( 0x1616, BdwHw1x3x8, "Intel(R) HD Graphics 5500" )
+NAMEDDEVICE( 0x161E, BdwHw1x3x8, "Intel(R) HD Graphics 5300" )
+DEVICE( 0x161D, BdwHw1x3x8 )
+DEVICE( 0x1622, BdwHw2x3x8 )
+NAMEDDEVICE( 0x162A, BdwHw2x3x8, "Intel(R) Iris(TM) Pro Graphics P6300" )
+NAMEDDEVICE( 0x1626, BdwHw2x3x8, "Intel(R) HD Graphics 6000" )
+DEVICE( 0x162B, BdwHw2x3x8 )
+DEVICE( 0x162E, BdwHw2x3x8 )
+DEVICE( 0x162D, BdwHw2x3x8 )
 #endif
 // clang-format on
diff --git a/shared/source/dll/devices/product_config_base.inl b/shared/source/dll/devices/product_config_base.inl
index b7608e1ca7..8d915bf295 100644
--- a/shared/source/dll/devices/product_config_base.inl
+++ b/shared/source/dll/devices/product_config_base.inl
@@ -7,85 +7,85 @@
 
 #if SUPPORT_XE_HPC_CORE
 #ifdef SUPPORT_PVC
-DEVICE_CONFIG_IDS_AND_REVISION(PVC_XL_A0, PVC_CONFIG, PVC_XL_IDS, 0x00)
-DEVICE_CONFIG_IDS_AND_REVISION(PVC_XL_A0P, PVC_CONFIG, PVC_XL_IDS, 0x01)
-DEVICE_CONFIG_IDS_AND_REVISION(PVC_XT_A0, PVC_CONFIG, PVC_XT_IDS, 0x03)
-DEVICE_CONFIG_IDS_AND_REVISION(PVC_XT_B0, PVC_CONFIG, PVC_XT_IDS, 0x05)
-DEVICE_CONFIG_IDS_AND_REVISION(PVC_XT_B1, PVC_CONFIG, PVC_XT_IDS, 0x06)
-DEVICE_CONFIG_IDS_AND_REVISION(PVC_XT_C0, PVC_CONFIG, PVC_XT_IDS, 0x07)
+DEVICE_CONFIG_IDS_AND_REVISION(PVC_XL_A0, PvcHwConfig, PVC_XL_IDS, 0x00)
+DEVICE_CONFIG_IDS_AND_REVISION(PVC_XL_A0P, PvcHwConfig, PVC_XL_IDS, 0x01)
+DEVICE_CONFIG_IDS_AND_REVISION(PVC_XT_A0, PvcHwConfig, PVC_XT_IDS, 0x03)
+DEVICE_CONFIG_IDS_AND_REVISION(PVC_XT_B0, PvcHwConfig, PVC_XT_IDS, 0x05)
+DEVICE_CONFIG_IDS_AND_REVISION(PVC_XT_B1, PvcHwConfig, PVC_XT_IDS, 0x06)
+DEVICE_CONFIG_IDS_AND_REVISION(PVC_XT_C0, PvcHwConfig, PVC_XT_IDS, 0x07)
 #endif
 #endif
 
 #ifdef SUPPORT_XE_HPG_CORE
 #ifdef SUPPORT_DG2
-DEVICE_CONFIG_IDS_AND_REVISION(DG2_G10_A0, DG2_CONFIG, DG2_G10_IDS, 0x00)
-DEVICE_CONFIG_IDS_AND_REVISION(DG2_G10_B0, DG2_CONFIG, DG2_G10_IDS, 0x04)
-DEVICE_CONFIG_IDS(DG2_G11, DG2_CONFIG, DG2_G11_IDS)
+DEVICE_CONFIG_IDS_AND_REVISION(DG2_G10_A0, Dg2HwConfig, DG2_G10_IDS, 0x00)
+DEVICE_CONFIG_IDS_AND_REVISION(DG2_G10_B0, Dg2HwConfig, DG2_G10_IDS, 0x04)
+DEVICE_CONFIG_IDS(DG2_G11, Dg2HwConfig, DG2_G11_IDS)
 #endif
 #endif
 
 #ifdef SUPPORT_XE_HP_CORE
 #ifdef SUPPORT_XE_HP_SDV
-DEVICE_CONFIG(XEHP_SDV, XE_HP_SDV_CONFIG)
+DEVICE_CONFIG(XEHP_SDV, XehpSdvHwConfig)
 #endif
 #endif
 
 #ifdef SUPPORT_GEN12LP
 #ifdef SUPPORT_TGLLP
-DEVICE_CONFIG(TGL, TGLLP_1x6x16)
+DEVICE_CONFIG(TGL, TgllpHw1x6x16)
 #endif
 #ifdef SUPPORT_DG1
-DEVICE_CONFIG(DG1, DG1_CONFIG)
+DEVICE_CONFIG(DG1, Dg1HwConfig)
 #endif
 #ifdef SUPPORT_RKL
-DEVICE_CONFIG(RKL, RKL_HW_CONFIG)
+DEVICE_CONFIG(RKL, RklHwConfig)
 #endif
 #ifdef SUPPORT_ADLS
-DEVICE_CONFIG(ADL_S, ADLS_HW_CONFIG)
+DEVICE_CONFIG(ADL_S, AdlsHwConfig)
 #endif
 #ifdef SUPPORT_ADLP
-DEVICE_CONFIG(ADL_P, ADLP_CONFIG)
+DEVICE_CONFIG(ADL_P, AdlpHwConfig)
 #endif
 #ifdef SUPPORT_ADLN
-DEVICE_CONFIG(ADL_N, ADLN_CONFIG)
+DEVICE_CONFIG(ADL_N, AdlnHwConfig)
 #endif
 #endif
 
 #ifdef SUPPORT_GEN11
 #ifdef SUPPORT_ICLLP
-DEVICE_CONFIG(ICL, ICLLP_1x8x8)
+DEVICE_CONFIG(ICL, IcllpHw1x8x8)
 #endif
 
 #ifdef SUPPORT_EHL
-DEVICE_CONFIG(EHL, EHL_HW_CONFIG)
+DEVICE_CONFIG(EHL, EhlHwConfig)
 #endif
 #ifdef SUPPORT_LKF
-DEVICE_CONFIG(LKF, LKF_1x8x8)
+DEVICE_CONFIG(LKF, LkfHw1x8x8)
 #endif
 #endif
 
 #ifdef SUPPORT_GEN9
 #ifdef SUPPORT_SKL
-DEVICE_CONFIG(SKL, SKL_1x3x8)
+DEVICE_CONFIG(SKL, SklHw1x3x8)
 #endif
 
 #ifdef SUPPORT_KBL
-DEVICE_CONFIG(KBL, KBL_1x3x6)
+DEVICE_CONFIG(KBL, KblHw1x3x6)
 #endif
 
 #ifdef SUPPORT_CFL
-DEVICE_CONFIG(CFL, CFL_1x3x6)
+DEVICE_CONFIG(CFL, CflHw1x3x6)
 #endif
 
 #ifdef SUPPORT_GLK
-DEVICE_CONFIG(GLK, GLK_1x3x6)
+DEVICE_CONFIG(GLK, GlkHw1x3x6)
 #endif
 
 #ifdef SUPPORT_BXT
-DEVICE_CONFIG(BXT, BXT_1x3x6)
+DEVICE_CONFIG(BXT, BxtHw1x3x6)
 #endif
 #endif
 
 #ifdef SUPPORT_GEN8
-DEVICE_CONFIG(BDW, BDW_1x3x8)
+DEVICE_CONFIG(BDW, BdwHw1x3x8)
 #endif
diff --git a/shared/source/gen11/hw_cmds_ehl.h b/shared/source/gen11/hw_cmds_ehl.h
index 690167a617..b6d5be2e6e 100644
--- a/shared/source/gen11/hw_cmds_ehl.h
+++ b/shared/source/gen11/hw_cmds_ehl.h
@@ -26,7 +26,7 @@ struct EHL : public ICLFamily {
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
 
-class EHL_HW_CONFIG : public EHL {
+class EhlHwConfig : public EHL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen11/hw_cmds_icllp.h b/shared/source/gen11/hw_cmds_icllp.h
index b500c161b9..3f9000e4bf 100644
--- a/shared/source/gen11/hw_cmds_icllp.h
+++ b/shared/source/gen11/hw_cmds_icllp.h
@@ -26,7 +26,7 @@ struct ICLLP : public ICLFamily {
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
 
-class ICLLP_1x8x8 : public ICLLP {
+class IcllpHw1x8x8 : public ICLLP {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -35,7 +35,7 @@ class ICLLP_1x8x8 : public ICLLP {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class ICLLP_1x4x8 : public ICLLP {
+class IcllpHw1x4x8 : public ICLLP {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -43,7 +43,7 @@ class ICLLP_1x4x8 : public ICLLP {
   private:
     static GT_SYSTEM_INFO gtSystemInfo;
 };
-class ICLLP_1x6x8 : public ICLLP {
+class IcllpHw1x6x8 : public ICLLP {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen11/hw_cmds_lkf.h b/shared/source/gen11/hw_cmds_lkf.h
index 807242543b..8487218866 100644
--- a/shared/source/gen11/hw_cmds_lkf.h
+++ b/shared/source/gen11/hw_cmds_lkf.h
@@ -25,7 +25,7 @@ struct LKF : public ICLFamily {
     static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
-class LKF_1x8x8 : public LKF {
+class LkfHw1x8x8 : public LKF {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen11/hw_info_ehl.cpp b/shared/source/gen11/hw_info_ehl.cpp
index b63de7e5aa..9541cc7084 100644
--- a/shared/source/gen11/hw_info_ehl.cpp
+++ b/shared/source/gen11/hw_info_ehl.cpp
@@ -144,16 +144,16 @@ void EHL::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     }
 }
 
-const HardwareInfo EHL_HW_CONFIG::hwInfo = {
+const HardwareInfo EhlHwConfig::hwInfo = {
     &EHL::platform,
     &EHL::featureTable,
     &EHL::workaroundTable,
-    &EHL_HW_CONFIG::gtSystemInfo,
+    &EhlHwConfig::gtSystemInfo,
     EHL::capabilityTable,
 };
 
-GT_SYSTEM_INFO EHL_HW_CONFIG::gtSystemInfo = {0};
-void EHL_HW_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO EhlHwConfig::gtSystemInfo = {0};
+void EhlHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     EHL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -163,11 +163,11 @@ void EHL_HW_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTab
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo EHL::hwInfo = EHL_HW_CONFIG::hwInfo;
+const HardwareInfo EHL::hwInfo = EhlHwConfig::hwInfo;
 const uint64_t EHL::defaultHardwareInfoConfig = 0x100040008;
 
 void setupEHLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
-    EHL_HW_CONFIG::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+    EhlHwConfig::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
 }
 void (*EHL::setupHardwareInfo)(HardwareInfo *, bool, uint64_t) = setupEHLHardwareInfoImpl;
 } // namespace NEO
diff --git a/shared/source/gen11/hw_info_icllp.cpp b/shared/source/gen11/hw_info_icllp.cpp
index 5a32e08f75..50ddcee4a2 100644
--- a/shared/source/gen11/hw_info_icllp.cpp
+++ b/shared/source/gen11/hw_info_icllp.cpp
@@ -145,16 +145,16 @@ void ICLLP::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAn
     }
 }
 
-const HardwareInfo ICLLP_1x8x8::hwInfo = {
+const HardwareInfo IcllpHw1x8x8::hwInfo = {
     &ICLLP::platform,
     &ICLLP::featureTable,
     &ICLLP::workaroundTable,
-    &ICLLP_1x8x8::gtSystemInfo,
+    &IcllpHw1x8x8::gtSystemInfo,
     ICLLP::capabilityTable,
 };
 
-GT_SYSTEM_INFO ICLLP_1x8x8::gtSystemInfo = {0};
-void ICLLP_1x8x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO IcllpHw1x8x8::gtSystemInfo = {0};
+void IcllpHw1x8x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     ICLLP::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -167,16 +167,16 @@ void ICLLP_1x8x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTable
     gtSysInfo->TotalPsThreadsWindowerRange = 64;
 };
 
-const HardwareInfo ICLLP_1x4x8::hwInfo = {
+const HardwareInfo IcllpHw1x4x8::hwInfo = {
     &ICLLP::platform,
     &ICLLP::featureTable,
     &ICLLP::workaroundTable,
-    &ICLLP_1x4x8::gtSystemInfo,
+    &IcllpHw1x4x8::gtSystemInfo,
     ICLLP::capabilityTable,
 };
 
-GT_SYSTEM_INFO ICLLP_1x4x8::gtSystemInfo = {0};
-void ICLLP_1x4x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO IcllpHw1x4x8::gtSystemInfo = {0};
+void IcllpHw1x4x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     ICLLP::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -186,16 +186,16 @@ void ICLLP_1x4x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTable
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo ICLLP_1x6x8::hwInfo = {
+const HardwareInfo IcllpHw1x6x8::hwInfo = {
     &ICLLP::platform,
     &ICLLP::featureTable,
     &ICLLP::workaroundTable,
-    &ICLLP_1x6x8::gtSystemInfo,
+    &IcllpHw1x6x8::gtSystemInfo,
     ICLLP::capabilityTable,
 };
 
-GT_SYSTEM_INFO ICLLP_1x6x8::gtSystemInfo = {0};
-void ICLLP_1x6x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO IcllpHw1x6x8::gtSystemInfo = {0};
+void IcllpHw1x6x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     ICLLP::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -205,19 +205,19 @@ void ICLLP_1x6x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTable
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo ICLLP::hwInfo = ICLLP_1x8x8::hwInfo;
+const HardwareInfo ICLLP::hwInfo = IcllpHw1x8x8::hwInfo;
 const uint64_t ICLLP::defaultHardwareInfoConfig = 0x100080008;
 
 void setupICLLPHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
     if (hwInfoConfig == 0x100080008) {
-        ICLLP_1x8x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        IcllpHw1x8x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x100040008) {
-        ICLLP_1x4x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        IcllpHw1x4x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x100060008) {
-        ICLLP_1x6x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        IcllpHw1x6x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x0) {
         // Default config
-        ICLLP_1x8x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        IcllpHw1x8x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else {
         UNRECOVERABLE_IF(true);
     }
diff --git a/shared/source/gen11/hw_info_lkf.cpp b/shared/source/gen11/hw_info_lkf.cpp
index 1e90e706cf..0aad70d37c 100644
--- a/shared/source/gen11/hw_info_lkf.cpp
+++ b/shared/source/gen11/hw_info_lkf.cpp
@@ -144,15 +144,15 @@ void LKF::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     }
 }
 
-const HardwareInfo LKF_1x8x8::hwInfo = {
+const HardwareInfo LkfHw1x8x8::hwInfo = {
     &LKF::platform,
     &LKF::featureTable,
     &LKF::workaroundTable,
-    &LKF_1x8x8::gtSystemInfo,
+    &LkfHw1x8x8::gtSystemInfo,
     LKF::capabilityTable,
 };
-GT_SYSTEM_INFO LKF_1x8x8::gtSystemInfo = {0};
-void LKF_1x8x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO LkfHw1x8x8::gtSystemInfo = {0};
+void LkfHw1x8x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     LKF::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -163,15 +163,15 @@ void LKF_1x8x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 16;
 };
 
-const HardwareInfo LKF::hwInfo = LKF_1x8x8::hwInfo;
+const HardwareInfo LKF::hwInfo = LkfHw1x8x8::hwInfo;
 const uint64_t LKF::defaultHardwareInfoConfig = 0x100080008;
 
 void setupLKFHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
     if (hwInfoConfig == 0x100080008) {
-        LKF_1x8x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        LkfHw1x8x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x0) {
         // Default config
-        LKF_1x8x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        LkfHw1x8x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else {
         UNRECOVERABLE_IF(true);
     }
diff --git a/shared/source/gen12lp/definitions/hw_info_setup_adln.inl b/shared/source/gen12lp/definitions/hw_info_setup_adln.inl
index e3ad7c7059..304c022a73 100644
--- a/shared/source/gen12lp/definitions/hw_info_setup_adln.inl
+++ b/shared/source/gen12lp/definitions/hw_info_setup_adln.inl
@@ -6,10 +6,10 @@
  */
 
 const uint64_t ADLN::defaultHardwareInfoConfig = 0x0;
-const HardwareInfo ADLN::hwInfo = ADLN_CONFIG::hwInfo;
+const HardwareInfo ADLN::hwInfo = AdlnHwConfig::hwInfo;
 
 void setupADLNHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
-    ADLN_CONFIG::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+    AdlnHwConfig::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
 }
 
 void (*ADLN::setupHardwareInfo)(HardwareInfo *, bool, const uint64_t) = setupADLNHardwareInfoImpl;
diff --git a/shared/source/gen12lp/definitions/hw_info_setup_adlp.inl b/shared/source/gen12lp/definitions/hw_info_setup_adlp.inl
index 73995f1020..fea2d8571f 100644
--- a/shared/source/gen12lp/definitions/hw_info_setup_adlp.inl
+++ b/shared/source/gen12lp/definitions/hw_info_setup_adlp.inl
@@ -1,15 +1,15 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 const uint64_t ADLP::defaultHardwareInfoConfig = 0x0;
-const HardwareInfo ADLP::hwInfo = ADLP_CONFIG::hwInfo;
+const HardwareInfo ADLP::hwInfo = AdlpHwConfig::hwInfo;
 
 void setupADLPHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
-    ADLP_CONFIG::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+    AdlpHwConfig::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
 }
 
 void (*ADLP::setupHardwareInfo)(HardwareInfo *, bool, const uint64_t) = setupADLPHardwareInfoImpl;
diff --git a/shared/source/gen12lp/hw_cmds_adln.h b/shared/source/gen12lp/hw_cmds_adln.h
index 1adadcfa77..41508e1d7f 100644
--- a/shared/source/gen12lp/hw_cmds_adln.h
+++ b/shared/source/gen12lp/hw_cmds_adln.h
@@ -25,7 +25,7 @@ struct ADLN : public TGLLPFamily {
     static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
-class ADLN_CONFIG : public ADLN {
+class AdlnHwConfig : public ADLN {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen12lp/hw_cmds_adlp.h b/shared/source/gen12lp/hw_cmds_adlp.h
index b6f0963266..00c4183d60 100644
--- a/shared/source/gen12lp/hw_cmds_adlp.h
+++ b/shared/source/gen12lp/hw_cmds_adlp.h
@@ -26,7 +26,7 @@ struct ADLP : public TGLLPFamily {
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
 
-class ADLP_CONFIG : public ADLP {
+class AdlpHwConfig : public ADLP {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen12lp/hw_cmds_adls.h b/shared/source/gen12lp/hw_cmds_adls.h
index 8401bf38df..66dbbef7d6 100644
--- a/shared/source/gen12lp/hw_cmds_adls.h
+++ b/shared/source/gen12lp/hw_cmds_adls.h
@@ -25,7 +25,7 @@ struct ADLS : public TGLLPFamily {
     static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
-class ADLS_HW_CONFIG : public ADLS {
+class AdlsHwConfig : public ADLS {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen12lp/hw_cmds_dg1.h b/shared/source/gen12lp/hw_cmds_dg1.h
index dd9e233f8a..811fe117ed 100644
--- a/shared/source/gen12lp/hw_cmds_dg1.h
+++ b/shared/source/gen12lp/hw_cmds_dg1.h
@@ -24,7 +24,7 @@ struct DG1 : public TGLLPFamily {
     static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
-class DG1_CONFIG : public DG1 {
+class Dg1HwConfig : public DG1 {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen12lp/hw_cmds_rkl.h b/shared/source/gen12lp/hw_cmds_rkl.h
index 11f0db268b..717f7cfb1d 100644
--- a/shared/source/gen12lp/hw_cmds_rkl.h
+++ b/shared/source/gen12lp/hw_cmds_rkl.h
@@ -22,7 +22,7 @@ struct RKL : public TGLLPFamily {
     static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
-class RKL_HW_CONFIG : public RKL {
+class RklHwConfig : public RKL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen12lp/hw_cmds_tgllp.h b/shared/source/gen12lp/hw_cmds_tgllp.h
index 044fb106c9..8e9a06caa9 100644
--- a/shared/source/gen12lp/hw_cmds_tgllp.h
+++ b/shared/source/gen12lp/hw_cmds_tgllp.h
@@ -26,7 +26,7 @@ struct TGLLP : public TGLLPFamily {
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
 
-class TGLLP_1x6x16 : public TGLLP {
+class TgllpHw1x6x16 : public TGLLP {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -35,7 +35,7 @@ class TGLLP_1x6x16 : public TGLLP {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class TGLLP_1x2x16 : public TGLLP {
+class TgllpHw1x2x16 : public TGLLP {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen12lp/hw_info_adln.cpp b/shared/source/gen12lp/hw_info_adln.cpp
index ec81cb68dd..ae287a7a2b 100644
--- a/shared/source/gen12lp/hw_info_adln.cpp
+++ b/shared/source/gen12lp/hw_info_adln.cpp
@@ -137,16 +137,16 @@ void ADLN::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAnd
     }
 }
 
-const HardwareInfo ADLN_CONFIG::hwInfo = {
+const HardwareInfo AdlnHwConfig::hwInfo = {
     &ADLN::platform,
     &ADLN::featureTable,
     &ADLN::workaroundTable,
-    &ADLN_CONFIG::gtSystemInfo,
+    &AdlnHwConfig::gtSystemInfo,
     ADLN::capabilityTable,
 };
 
-GT_SYSTEM_INFO ADLN_CONFIG::gtSystemInfo = {0};
-void ADLN_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO AdlnHwConfig::gtSystemInfo = {0};
+void AdlnHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     ADLN::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
diff --git a/shared/source/gen12lp/hw_info_adlp.cpp b/shared/source/gen12lp/hw_info_adlp.cpp
index 84f6006eb5..20e1027493 100644
--- a/shared/source/gen12lp/hw_info_adlp.cpp
+++ b/shared/source/gen12lp/hw_info_adlp.cpp
@@ -138,16 +138,16 @@ void ADLP::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAnd
     }
 }
 
-const HardwareInfo ADLP_CONFIG::hwInfo = {
+const HardwareInfo AdlpHwConfig::hwInfo = {
     &ADLP::platform,
     &ADLP::featureTable,
     &ADLP::workaroundTable,
-    &ADLP_CONFIG::gtSystemInfo,
+    &AdlpHwConfig::gtSystemInfo,
     ADLP::capabilityTable,
 };
 
-GT_SYSTEM_INFO ADLP_CONFIG::gtSystemInfo = {0};
-void ADLP_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO AdlpHwConfig::gtSystemInfo = {0};
+void AdlpHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
     gtSysInfo->CsrSizeInMb = 8;
     gtSysInfo->IsDynamicallyPopulated = false;
diff --git a/shared/source/gen12lp/hw_info_adls.cpp b/shared/source/gen12lp/hw_info_adls.cpp
index 14246467d5..42d3ea7ab6 100644
--- a/shared/source/gen12lp/hw_info_adls.cpp
+++ b/shared/source/gen12lp/hw_info_adls.cpp
@@ -138,16 +138,16 @@ void ADLS::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAnd
     }
 }
 
-const HardwareInfo ADLS_HW_CONFIG::hwInfo = {
+const HardwareInfo AdlsHwConfig::hwInfo = {
     &ADLS::platform,
     &ADLS::featureTable,
     &ADLS::workaroundTable,
-    &ADLS_HW_CONFIG::gtSystemInfo,
+    &AdlsHwConfig::gtSystemInfo,
     ADLS::capabilityTable,
 };
 
-GT_SYSTEM_INFO ADLS_HW_CONFIG::gtSystemInfo = {0};
-void ADLS_HW_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO AdlsHwConfig::gtSystemInfo = {0};
+void AdlsHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -167,11 +167,11 @@ void ADLS_HW_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTa
     gtSysInfo->CCSInfo.Instances.CCSEnableMask = 0b1;
 };
 
-const HardwareInfo ADLS::hwInfo = ADLS_HW_CONFIG::hwInfo;
+const HardwareInfo ADLS::hwInfo = AdlsHwConfig::hwInfo;
 const uint64_t ADLS::defaultHardwareInfoConfig = 0x100020010;
 
 void setupADLSHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
-    ADLS_HW_CONFIG::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+    AdlsHwConfig::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
 }
 
 void (*ADLS::setupHardwareInfo)(HardwareInfo *, bool, const uint64_t) = setupADLSHardwareInfoImpl;
diff --git a/shared/source/gen12lp/hw_info_dg1.cpp b/shared/source/gen12lp/hw_info_dg1.cpp
index 07de079eda..0bf64d6909 100644
--- a/shared/source/gen12lp/hw_info_dg1.cpp
+++ b/shared/source/gen12lp/hw_info_dg1.cpp
@@ -151,16 +151,16 @@ void DG1::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     }
 }
 
-const HardwareInfo DG1_CONFIG::hwInfo = {
+const HardwareInfo Dg1HwConfig::hwInfo = {
     &DG1::platform,
     &DG1::featureTable,
     &DG1::workaroundTable,
-    &DG1_CONFIG::gtSystemInfo,
+    &Dg1HwConfig::gtSystemInfo,
     DG1::capabilityTable,
 };
 
-GT_SYSTEM_INFO DG1_CONFIG::gtSystemInfo = {0};
-void DG1_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO Dg1HwConfig::gtSystemInfo = {0};
+void Dg1HwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     DG1::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -175,15 +175,15 @@ void DG1_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableA
     gtSysInfo->CCSInfo.Instances.CCSEnableMask = 0b1;
 };
 
-const HardwareInfo DG1::hwInfo = DG1_CONFIG::hwInfo;
+const HardwareInfo DG1::hwInfo = Dg1HwConfig::hwInfo;
 const uint64_t DG1::defaultHardwareInfoConfig = 0x100060010;
 
 void setupDG1HardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
     if (hwInfoConfig == 0x100060010) {
-        DG1_CONFIG::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        Dg1HwConfig::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x0) {
         // Default config
-        DG1_CONFIG::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        Dg1HwConfig::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else {
         UNRECOVERABLE_IF(true);
     }
diff --git a/shared/source/gen12lp/hw_info_rkl.cpp b/shared/source/gen12lp/hw_info_rkl.cpp
index 2cf83829e7..ac42a8dac7 100644
--- a/shared/source/gen12lp/hw_info_rkl.cpp
+++ b/shared/source/gen12lp/hw_info_rkl.cpp
@@ -141,16 +141,16 @@ void RKL::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     }
 }
 
-const HardwareInfo RKL_HW_CONFIG::hwInfo = {
+const HardwareInfo RklHwConfig::hwInfo = {
     &RKL::platform,
     &RKL::featureTable,
     &RKL::workaroundTable,
-    &RKL_HW_CONFIG::gtSystemInfo,
+    &RklHwConfig::gtSystemInfo,
     RKL::capabilityTable,
 };
 
-GT_SYSTEM_INFO RKL_HW_CONFIG::gtSystemInfo = {0};
-void RKL_HW_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO RklHwConfig::gtSystemInfo = {0};
+void RklHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     RKL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -164,11 +164,11 @@ void RKL_HW_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTab
     gtSysInfo->CCSInfo.Instances.CCSEnableMask = 0b1;
 };
 
-const HardwareInfo RKL::hwInfo = RKL_HW_CONFIG::hwInfo;
+const HardwareInfo RKL::hwInfo = RklHwConfig::hwInfo;
 const uint64_t RKL::defaultHardwareInfoConfig = 0x100020010;
 
 void setupRKLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
-    RKL_HW_CONFIG::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+    RklHwConfig::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
 }
 
 void (*RKL::setupHardwareInfo)(HardwareInfo *, bool, const uint64_t) = setupRKLHardwareInfoImpl;
diff --git a/shared/source/gen12lp/hw_info_tgllp.cpp b/shared/source/gen12lp/hw_info_tgllp.cpp
index 1c29fee7f7..f74362280d 100644
--- a/shared/source/gen12lp/hw_info_tgllp.cpp
+++ b/shared/source/gen12lp/hw_info_tgllp.cpp
@@ -142,16 +142,16 @@ void TGLLP::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAn
     }
 }
 
-const HardwareInfo TGLLP_1x6x16::hwInfo = {
+const HardwareInfo TgllpHw1x6x16::hwInfo = {
     &TGLLP::platform,
     &TGLLP::featureTable,
     &TGLLP::workaroundTable,
-    &TGLLP_1x6x16::gtSystemInfo,
+    &TgllpHw1x6x16::gtSystemInfo,
     TGLLP::capabilityTable,
 };
 
-GT_SYSTEM_INFO TGLLP_1x6x16::gtSystemInfo = {0};
-void TGLLP_1x6x16::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO TgllpHw1x6x16::gtSystemInfo = {0};
+void TgllpHw1x6x16::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     TGLLP::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -170,16 +170,16 @@ void TGLLP_1x6x16::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTabl
     gtSysInfo->CCSInfo.Instances.CCSEnableMask = 0b1;
 };
 
-const HardwareInfo TGLLP_1x2x16::hwInfo = {
+const HardwareInfo TgllpHw1x2x16::hwInfo = {
     &TGLLP::platform,
     &TGLLP::featureTable,
     &TGLLP::workaroundTable,
-    &TGLLP_1x2x16::gtSystemInfo,
+    &TgllpHw1x2x16::gtSystemInfo,
     TGLLP::capabilityTable,
 };
 
-GT_SYSTEM_INFO TGLLP_1x2x16::gtSystemInfo = {0};
-void TGLLP_1x2x16::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO TgllpHw1x2x16::gtSystemInfo = {0};
+void TgllpHw1x2x16::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     TGLLP::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -198,17 +198,17 @@ void TGLLP_1x2x16::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTabl
     gtSysInfo->CCSInfo.Instances.CCSEnableMask = 0b1;
 };
 
-const HardwareInfo TGLLP::hwInfo = TGLLP_1x6x16::hwInfo;
+const HardwareInfo TGLLP::hwInfo = TgllpHw1x6x16::hwInfo;
 const uint64_t TGLLP::defaultHardwareInfoConfig = 0x100060010;
 
 void setupTGLLPHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
     if (hwInfoConfig == 0x100060010) {
-        TGLLP_1x6x16::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        TgllpHw1x6x16::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x100020010) {
-        TGLLP_1x2x16::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        TgllpHw1x2x16::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x0) {
         // Default config
-        TGLLP_1x6x16::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        TgllpHw1x6x16::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else {
         UNRECOVERABLE_IF(true);
     }
diff --git a/shared/source/gen8/hw_cmds_bdw.h b/shared/source/gen8/hw_cmds_bdw.h
index 055a14ba22..1979a025f3 100644
--- a/shared/source/gen8/hw_cmds_bdw.h
+++ b/shared/source/gen8/hw_cmds_bdw.h
@@ -27,7 +27,7 @@ struct BDW : public BDWFamily {
     static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
-class BDW_1x2x6 : public BDW {
+class BdwHw1x2x6 : public BDW {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -35,7 +35,7 @@ class BDW_1x2x6 : public BDW {
   private:
     static GT_SYSTEM_INFO gtSystemInfo;
 };
-class BDW_1x3x6 : public BDW {
+class BdwHw1x3x6 : public BDW {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -43,7 +43,7 @@ class BDW_1x3x6 : public BDW {
   private:
     static GT_SYSTEM_INFO gtSystemInfo;
 };
-class BDW_1x3x8 : public BDW {
+class BdwHw1x3x8 : public BDW {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -51,7 +51,7 @@ class BDW_1x3x8 : public BDW {
   private:
     static GT_SYSTEM_INFO gtSystemInfo;
 };
-class BDW_2x3x8 : public BDW {
+class BdwHw2x3x8 : public BDW {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen8/hw_info_bdw.cpp b/shared/source/gen8/hw_info_bdw.cpp
index 974fb143f6..fcd92bb52b 100644
--- a/shared/source/gen8/hw_info_bdw.cpp
+++ b/shared/source/gen8/hw_info_bdw.cpp
@@ -135,16 +135,16 @@ void BDW::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     }
 }
 
-const HardwareInfo BDW_1x2x6::hwInfo = {
+const HardwareInfo BdwHw1x2x6::hwInfo = {
     &BDW::platform,
     &BDW::featureTable,
     &BDW::workaroundTable,
-    &BDW_1x2x6::gtSystemInfo,
+    &BdwHw1x2x6::gtSystemInfo,
     BDW::capabilityTable,
 };
 
-GT_SYSTEM_INFO BDW_1x2x6::gtSystemInfo = {0};
-void BDW_1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO BdwHw1x2x6::gtSystemInfo = {0};
+void BdwHw1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     BDW::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -154,15 +154,15 @@ void BDW_1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo BDW_1x3x6::hwInfo = {
+const HardwareInfo BdwHw1x3x6::hwInfo = {
     &BDW::platform,
     &BDW::featureTable,
     &BDW::workaroundTable,
-    &BDW_1x3x6::gtSystemInfo,
+    &BdwHw1x3x6::gtSystemInfo,
     BDW::capabilityTable,
 };
-GT_SYSTEM_INFO BDW_1x3x6::gtSystemInfo = {0};
-void BDW_1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO BdwHw1x3x6::gtSystemInfo = {0};
+void BdwHw1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     BDW::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -172,15 +172,15 @@ void BDW_1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo BDW_1x3x8::hwInfo = {
+const HardwareInfo BdwHw1x3x8::hwInfo = {
     &BDW::platform,
     &BDW::featureTable,
     &BDW::workaroundTable,
-    &BDW_1x3x8::gtSystemInfo,
+    &BdwHw1x3x8::gtSystemInfo,
     BDW::capabilityTable,
 };
-GT_SYSTEM_INFO BDW_1x3x8::gtSystemInfo = {0};
-void BDW_1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO BdwHw1x3x8::gtSystemInfo = {0};
+void BdwHw1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     BDW::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -190,15 +190,15 @@ void BDW_1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo BDW_2x3x8::hwInfo = {
+const HardwareInfo BdwHw2x3x8::hwInfo = {
     &BDW::platform,
     &BDW::featureTable,
     &BDW::workaroundTable,
-    &BDW_2x3x8::gtSystemInfo,
+    &BdwHw2x3x8::gtSystemInfo,
     BDW::capabilityTable,
 };
-GT_SYSTEM_INFO BDW_2x3x8::gtSystemInfo = {0};
-void BDW_2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO BdwHw2x3x8::gtSystemInfo = {0};
+void BdwHw2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     BDW::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -208,21 +208,21 @@ void BDW_2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 16;
 };
 
-const HardwareInfo BDW::hwInfo = BDW_1x3x8::hwInfo;
+const HardwareInfo BDW::hwInfo = BdwHw1x3x8::hwInfo;
 const uint64_t BDW::defaultHardwareInfoConfig = 0x100030008;
 
 void setupBDWHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
     if (hwInfoConfig == 0x200030008) {
-        BDW_2x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        BdwHw2x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x100030008) {
-        BDW_1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        BdwHw1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x100030006) {
-        BDW_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        BdwHw1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x100020006) {
-        BDW_1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        BdwHw1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x0) {
         // Default config
-        BDW_1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        BdwHw1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else {
         UNRECOVERABLE_IF(true);
     }
diff --git a/shared/source/gen9/hw_cmds_bxt.h b/shared/source/gen9/hw_cmds_bxt.h
index caba958f19..23b65bc690 100644
--- a/shared/source/gen9/hw_cmds_bxt.h
+++ b/shared/source/gen9/hw_cmds_bxt.h
@@ -27,7 +27,7 @@ struct BXT : public SKLFamily {
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
 
-class BXT_1x2x6 : public BXT {
+class BxtHw1x2x6 : public BXT {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -36,7 +36,7 @@ class BXT_1x2x6 : public BXT {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class BXT_1x3x6 : public BXT {
+class BxtHw1x3x6 : public BXT {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen9/hw_cmds_cfl.h b/shared/source/gen9/hw_cmds_cfl.h
index 954e8d8895..f83fdfc8ec 100644
--- a/shared/source/gen9/hw_cmds_cfl.h
+++ b/shared/source/gen9/hw_cmds_cfl.h
@@ -27,7 +27,7 @@ struct CFL : public SKLFamily {
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
 
-class CFL_1x2x6 : public CFL {
+class CflHw1x2x6 : public CFL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -36,7 +36,7 @@ class CFL_1x2x6 : public CFL {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class CFL_1x3x6 : public CFL {
+class CflHw1x3x6 : public CFL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -45,7 +45,7 @@ class CFL_1x3x6 : public CFL {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class CFL_1x3x8 : public CFL {
+class CflHw1x3x8 : public CFL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -54,7 +54,7 @@ class CFL_1x3x8 : public CFL {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class CFL_2x3x8 : public CFL {
+class CflHw2x3x8 : public CFL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -63,7 +63,7 @@ class CFL_2x3x8 : public CFL {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class CFL_3x3x8 : public CFL {
+class CflHw3x3x8 : public CFL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen9/hw_cmds_glk.h b/shared/source/gen9/hw_cmds_glk.h
index c8b73872d5..a65e9f182e 100644
--- a/shared/source/gen9/hw_cmds_glk.h
+++ b/shared/source/gen9/hw_cmds_glk.h
@@ -27,7 +27,7 @@ struct GLK : public SKLFamily {
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
 
-class GLK_1x3x6 : public GLK {
+class GlkHw1x3x6 : public GLK {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -36,7 +36,7 @@ class GLK_1x3x6 : public GLK {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class GLK_1x2x6 : public GLK {
+class GlkHw1x2x6 : public GLK {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen9/hw_cmds_kbl.h b/shared/source/gen9/hw_cmds_kbl.h
index cf59429f5b..5e5da33f99 100644
--- a/shared/source/gen9/hw_cmds_kbl.h
+++ b/shared/source/gen9/hw_cmds_kbl.h
@@ -27,7 +27,7 @@ struct KBL : public SKLFamily {
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
 
-class KBL_1x2x6 : public KBL {
+class KblHw1x2x6 : public KBL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -36,7 +36,7 @@ class KBL_1x2x6 : public KBL {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class KBL_1x3x6 : public KBL {
+class KblHw1x3x6 : public KBL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -45,7 +45,7 @@ class KBL_1x3x6 : public KBL {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class KBL_1x3x8 : public KBL {
+class KblHw1x3x8 : public KBL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -54,7 +54,7 @@ class KBL_1x3x8 : public KBL {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class KBL_2x3x8 : public KBL {
+class KblHw2x3x8 : public KBL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -63,7 +63,7 @@ class KBL_2x3x8 : public KBL {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class KBL_3x3x8 : public KBL {
+class KblHw3x3x8 : public KBL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen9/hw_cmds_skl.h b/shared/source/gen9/hw_cmds_skl.h
index f49695ae5f..70f45eee07 100644
--- a/shared/source/gen9/hw_cmds_skl.h
+++ b/shared/source/gen9/hw_cmds_skl.h
@@ -27,7 +27,7 @@ struct SKL : public SKLFamily {
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
 
-class SKL_1x2x6 : public SKL {
+class SklHw1x2x6 : public SKL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -36,7 +36,7 @@ class SKL_1x2x6 : public SKL {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class SKL_1x3x6 : public SKL {
+class SklHw1x3x6 : public SKL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -45,7 +45,7 @@ class SKL_1x3x6 : public SKL {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class SKL_1x3x8 : public SKL {
+class SklHw1x3x8 : public SKL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -54,7 +54,7 @@ class SKL_1x3x8 : public SKL {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class SKL_2x3x8 : public SKL {
+class SklHw2x3x8 : public SKL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
@@ -63,7 +63,7 @@ class SKL_2x3x8 : public SKL {
     static GT_SYSTEM_INFO gtSystemInfo;
 };
 
-class SKL_3x3x8 : public SKL {
+class SklHw3x3x8 : public SKL {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/gen9/hw_info_bxt.cpp b/shared/source/gen9/hw_info_bxt.cpp
index 399585c291..be37f610e4 100644
--- a/shared/source/gen9/hw_info_bxt.cpp
+++ b/shared/source/gen9/hw_info_bxt.cpp
@@ -152,15 +152,15 @@ void BXT::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     }
 }
 
-const HardwareInfo BXT_1x2x6::hwInfo = {
+const HardwareInfo BxtHw1x2x6::hwInfo = {
     &BXT::platform,
     &BXT::featureTable,
     &BXT::workaroundTable,
-    &BXT_1x2x6::gtSystemInfo,
+    &BxtHw1x2x6::gtSystemInfo,
     BXT::capabilityTable,
 };
-GT_SYSTEM_INFO BXT_1x2x6::gtSystemInfo = {0};
-void BXT_1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO BxtHw1x2x6::gtSystemInfo = {0};
+void BxtHw1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     BXT::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -170,15 +170,15 @@ void BXT_1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo BXT_1x3x6::hwInfo = {
+const HardwareInfo BxtHw1x3x6::hwInfo = {
     &BXT::platform,
     &BXT::featureTable,
     &BXT::workaroundTable,
-    &BXT_1x3x6::gtSystemInfo,
+    &BxtHw1x3x6::gtSystemInfo,
     BXT::capabilityTable,
 };
-GT_SYSTEM_INFO BXT_1x3x6::gtSystemInfo = {0};
-void BXT_1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO BxtHw1x3x6::gtSystemInfo = {0};
+void BxtHw1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     BXT::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -188,17 +188,17 @@ void BXT_1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo BXT::hwInfo = BXT_1x3x6::hwInfo;
+const HardwareInfo BXT::hwInfo = BxtHw1x3x6::hwInfo;
 const uint64_t BXT::defaultHardwareInfoConfig = 0x100030006;
 
 void setupBXTHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
     if (hwInfoConfig == 0x100020006) {
-        BXT_1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        BxtHw1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x100030006) {
-        BXT_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        BxtHw1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x0) {
         // Default config
-        BXT_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        BxtHw1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else {
         UNRECOVERABLE_IF(true);
     }
diff --git a/shared/source/gen9/hw_info_cfl.cpp b/shared/source/gen9/hw_info_cfl.cpp
index 85cd01b3f8..cf3b092cfa 100644
--- a/shared/source/gen9/hw_info_cfl.cpp
+++ b/shared/source/gen9/hw_info_cfl.cpp
@@ -140,15 +140,15 @@ void CFL::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     }
 }
 
-const HardwareInfo CFL_1x2x6::hwInfo = {
+const HardwareInfo CflHw1x2x6::hwInfo = {
     &CFL::platform,
     &CFL::featureTable,
     &CFL::workaroundTable,
-    &CFL_1x2x6::gtSystemInfo,
+    &CflHw1x2x6::gtSystemInfo,
     CFL::capabilityTable,
 };
-GT_SYSTEM_INFO CFL_1x2x6::gtSystemInfo = {0};
-void CFL_1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO CflHw1x2x6::gtSystemInfo = {0};
+void CflHw1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     CFL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -158,16 +158,16 @@ void CFL_1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo CFL_1x3x6::hwInfo = {
+const HardwareInfo CflHw1x3x6::hwInfo = {
     &CFL::platform,
     &CFL::featureTable,
     &CFL::workaroundTable,
-    &CFL_1x3x6::gtSystemInfo,
+    &CflHw1x3x6::gtSystemInfo,
     CFL::capabilityTable,
 };
 
-GT_SYSTEM_INFO CFL_1x3x6::gtSystemInfo = {0};
-void CFL_1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO CflHw1x3x6::gtSystemInfo = {0};
+void CflHw1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     CFL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -177,16 +177,16 @@ void CFL_1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo CFL_1x3x8::hwInfo = {
+const HardwareInfo CflHw1x3x8::hwInfo = {
     &CFL::platform,
     &CFL::featureTable,
     &CFL::workaroundTable,
-    &CFL_1x3x8::gtSystemInfo,
+    &CflHw1x3x8::gtSystemInfo,
     CFL::capabilityTable,
 };
 
-GT_SYSTEM_INFO CFL_1x3x8::gtSystemInfo = {0};
-void CFL_1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO CflHw1x3x8::gtSystemInfo = {0};
+void CflHw1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     CFL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -196,15 +196,15 @@ void CFL_1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo CFL_2x3x8::hwInfo = {
+const HardwareInfo CflHw2x3x8::hwInfo = {
     &CFL::platform,
     &CFL::featureTable,
     &CFL::workaroundTable,
-    &CFL_2x3x8::gtSystemInfo,
+    &CflHw2x3x8::gtSystemInfo,
     CFL::capabilityTable,
 };
-GT_SYSTEM_INFO CFL_2x3x8::gtSystemInfo = {0};
-void CFL_2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO CflHw2x3x8::gtSystemInfo = {0};
+void CflHw2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     CFL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -214,15 +214,15 @@ void CFL_2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 16;
 };
 
-const HardwareInfo CFL_3x3x8::hwInfo = {
+const HardwareInfo CflHw3x3x8::hwInfo = {
     &CFL::platform,
     &CFL::featureTable,
     &CFL::workaroundTable,
-    &CFL_3x3x8::gtSystemInfo,
+    &CflHw3x3x8::gtSystemInfo,
     CFL::capabilityTable,
 };
-GT_SYSTEM_INFO CFL_3x3x8::gtSystemInfo = {0};
-void CFL_3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO CflHw3x3x8::gtSystemInfo = {0};
+void CflHw3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     CFL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -232,23 +232,23 @@ void CFL_3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 24;
 };
 
-const HardwareInfo CFL::hwInfo = CFL_1x3x6::hwInfo;
+const HardwareInfo CFL::hwInfo = CflHw1x3x6::hwInfo;
 const uint64_t CFL::defaultHardwareInfoConfig = 0x100030006;
 
 void setupCFLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
     if (hwInfoConfig == 0x100030008) {
-        CFL_1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        CflHw1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x200030008) {
-        CFL_2x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        CflHw2x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x300030008) {
-        CFL_3x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        CflHw3x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x100020006) {
-        CFL_1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        CflHw1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x100030006) {
-        CFL_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        CflHw1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x0) {
         // Default config
-        CFL_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        CflHw1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else {
         UNRECOVERABLE_IF(true);
     }
diff --git a/shared/source/gen9/hw_info_glk.cpp b/shared/source/gen9/hw_info_glk.cpp
index 430478559b..ebe8b9daae 100644
--- a/shared/source/gen9/hw_info_glk.cpp
+++ b/shared/source/gen9/hw_info_glk.cpp
@@ -140,16 +140,16 @@ void GLK::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     }
 }
 
-const HardwareInfo GLK_1x3x6::hwInfo = {
+const HardwareInfo GlkHw1x3x6::hwInfo = {
     &GLK::platform,
     &GLK::featureTable,
     &GLK::workaroundTable,
-    &GLK_1x3x6::gtSystemInfo,
+    &GlkHw1x3x6::gtSystemInfo,
     GLK::capabilityTable,
 };
 
-GT_SYSTEM_INFO GLK_1x3x6::gtSystemInfo = {0};
-void GLK_1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO GlkHw1x3x6::gtSystemInfo = {0};
+void GlkHw1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     GLK::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -159,16 +159,16 @@ void GLK_1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo GLK_1x2x6::hwInfo = {
+const HardwareInfo GlkHw1x2x6::hwInfo = {
     &GLK::platform,
     &GLK::featureTable,
     &GLK::workaroundTable,
-    &GLK_1x2x6::gtSystemInfo,
+    &GlkHw1x2x6::gtSystemInfo,
     GLK::capabilityTable,
 };
 
-GT_SYSTEM_INFO GLK_1x2x6::gtSystemInfo = {0};
-void GLK_1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO GlkHw1x2x6::gtSystemInfo = {0};
+void GlkHw1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     GLK::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -178,17 +178,17 @@ void GLK_1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo GLK::hwInfo = GLK_1x3x6::hwInfo;
+const HardwareInfo GLK::hwInfo = GlkHw1x3x6::hwInfo;
 const uint64_t GLK::defaultHardwareInfoConfig = 0x100030006;
 
 void setupGLKHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
     if (hwInfoConfig == 0x100020006) {
-        GLK_1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        GlkHw1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x100030006) {
-        GLK_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        GlkHw1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x0) {
         // Default config
-        GLK_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        GlkHw1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else {
         UNRECOVERABLE_IF(true);
     }
diff --git a/shared/source/gen9/hw_info_kbl.cpp b/shared/source/gen9/hw_info_kbl.cpp
index 4ae7818f74..43d70129a9 100644
--- a/shared/source/gen9/hw_info_kbl.cpp
+++ b/shared/source/gen9/hw_info_kbl.cpp
@@ -149,15 +149,15 @@ void KBL::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     }
 }
 
-const HardwareInfo KBL_1x2x6::hwInfo = {
+const HardwareInfo KblHw1x2x6::hwInfo = {
     &KBL::platform,
     &KBL::featureTable,
     &KBL::workaroundTable,
-    &KBL_1x2x6::gtSystemInfo,
+    &KblHw1x2x6::gtSystemInfo,
     KBL::capabilityTable,
 };
-GT_SYSTEM_INFO KBL_1x2x6::gtSystemInfo = {0};
-void KBL_1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO KblHw1x2x6::gtSystemInfo = {0};
+void KblHw1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     KBL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -167,16 +167,16 @@ void KBL_1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo KBL_1x3x6::hwInfo = {
+const HardwareInfo KblHw1x3x6::hwInfo = {
     &KBL::platform,
     &KBL::featureTable,
     &KBL::workaroundTable,
-    &KBL_1x3x6::gtSystemInfo,
+    &KblHw1x3x6::gtSystemInfo,
     KBL::capabilityTable,
 };
 
-GT_SYSTEM_INFO KBL_1x3x6::gtSystemInfo = {0};
-void KBL_1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO KblHw1x3x6::gtSystemInfo = {0};
+void KblHw1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     KBL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -186,15 +186,15 @@ void KBL_1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo KBL_1x3x8::hwInfo = {
+const HardwareInfo KblHw1x3x8::hwInfo = {
     &KBL::platform,
     &KBL::featureTable,
     &KBL::workaroundTable,
-    &KBL_1x3x8::gtSystemInfo,
+    &KblHw1x3x8::gtSystemInfo,
     KBL::capabilityTable,
 };
-GT_SYSTEM_INFO KBL_1x3x8::gtSystemInfo = {0};
-void KBL_1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO KblHw1x3x8::gtSystemInfo = {0};
+void KblHw1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     KBL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -204,15 +204,15 @@ void KBL_1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo KBL_2x3x8::hwInfo = {
+const HardwareInfo KblHw2x3x8::hwInfo = {
     &KBL::platform,
     &KBL::featureTable,
     &KBL::workaroundTable,
-    &KBL_2x3x8::gtSystemInfo,
+    &KblHw2x3x8::gtSystemInfo,
     KBL::capabilityTable,
 };
-GT_SYSTEM_INFO KBL_2x3x8::gtSystemInfo = {0};
-void KBL_2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO KblHw2x3x8::gtSystemInfo = {0};
+void KblHw2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     KBL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -222,15 +222,15 @@ void KBL_2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 16;
 };
 
-const HardwareInfo KBL_3x3x8::hwInfo = {
+const HardwareInfo KblHw3x3x8::hwInfo = {
     &KBL::platform,
     &KBL::featureTable,
     &KBL::workaroundTable,
-    &KBL_3x3x8::gtSystemInfo,
+    &KblHw3x3x8::gtSystemInfo,
     KBL::capabilityTable,
 };
-GT_SYSTEM_INFO KBL_3x3x8::gtSystemInfo = {0};
-void KBL_3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO KblHw3x3x8::gtSystemInfo = {0};
+void KblHw3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     KBL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -240,23 +240,23 @@ void KBL_3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 23;
 };
 
-const HardwareInfo KBL::hwInfo = KBL_1x3x6::hwInfo;
+const HardwareInfo KBL::hwInfo = KblHw1x3x6::hwInfo;
 const uint64_t KBL::defaultHardwareInfoConfig = 0x100030006;
 
 void setupKBLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
     if (hwInfoConfig == 0x100030008) {
-        KBL_1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        KblHw1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x200030008) {
-        KBL_2x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        KblHw2x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x300030008) {
-        KBL_3x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        KblHw3x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x100020006) {
-        KBL_1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        KblHw1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x100030006) {
-        KBL_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        KblHw1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x0) {
         // Default config
-        KBL_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        KblHw1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else {
         UNRECOVERABLE_IF(true);
     }
diff --git a/shared/source/gen9/hw_info_skl.cpp b/shared/source/gen9/hw_info_skl.cpp
index 1b89613ca8..5f9441d329 100644
--- a/shared/source/gen9/hw_info_skl.cpp
+++ b/shared/source/gen9/hw_info_skl.cpp
@@ -162,15 +162,15 @@ void SKL::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     }
 }
 
-const HardwareInfo SKL_1x2x6::hwInfo = {
+const HardwareInfo SklHw1x2x6::hwInfo = {
     &SKL::platform,
     &SKL::featureTable,
     &SKL::workaroundTable,
-    &SKL_1x2x6::gtSystemInfo,
+    &SklHw1x2x6::gtSystemInfo,
     SKL::capabilityTable,
 };
-GT_SYSTEM_INFO SKL_1x2x6::gtSystemInfo = {0};
-void SKL_1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO SklHw1x2x6::gtSystemInfo = {0};
+void SklHw1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -180,15 +180,15 @@ void SKL_1x2x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo SKL_1x3x6::hwInfo = {
+const HardwareInfo SklHw1x3x6::hwInfo = {
     &SKL::platform,
     &SKL::featureTable,
     &SKL::workaroundTable,
-    &SKL_1x3x6::gtSystemInfo,
+    &SklHw1x3x6::gtSystemInfo,
     SKL::capabilityTable,
 };
-GT_SYSTEM_INFO SKL_1x3x6::gtSystemInfo = {0};
-void SKL_1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO SklHw1x3x6::gtSystemInfo = {0};
+void SklHw1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -198,15 +198,15 @@ void SKL_1x3x6::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo SKL_1x3x8::hwInfo = {
+const HardwareInfo SklHw1x3x8::hwInfo = {
     &SKL::platform,
     &SKL::featureTable,
     &SKL::workaroundTable,
-    &SKL_1x3x8::gtSystemInfo,
+    &SklHw1x3x8::gtSystemInfo,
     SKL::capabilityTable,
 };
-GT_SYSTEM_INFO SKL_1x3x8::gtSystemInfo = {0};
-void SKL_1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO SklHw1x3x8::gtSystemInfo = {0};
+void SklHw1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -216,15 +216,15 @@ void SKL_1x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 8;
 };
 
-const HardwareInfo SKL_2x3x8::hwInfo = {
+const HardwareInfo SklHw2x3x8::hwInfo = {
     &SKL::platform,
     &SKL::featureTable,
     &SKL::workaroundTable,
-    &SKL_2x3x8::gtSystemInfo,
+    &SklHw2x3x8::gtSystemInfo,
     SKL::capabilityTable,
 };
-GT_SYSTEM_INFO SKL_2x3x8::gtSystemInfo = {0};
-void SKL_2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO SklHw2x3x8::gtSystemInfo = {0};
+void SklHw2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -234,15 +234,15 @@ void SKL_2x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 16;
 };
 
-const HardwareInfo SKL_3x3x8::hwInfo = {
+const HardwareInfo SklHw3x3x8::hwInfo = {
     &SKL::platform,
     &SKL::featureTable,
     &SKL::workaroundTable,
-    &SKL_3x3x8::gtSystemInfo,
+    &SklHw3x3x8::gtSystemInfo,
     SKL::capabilityTable,
 };
-GT_SYSTEM_INFO SKL_3x3x8::gtSystemInfo = {0};
-void SKL_3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO SklHw3x3x8::gtSystemInfo = {0};
+void SklHw3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable);
 
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
@@ -252,23 +252,23 @@ void SKL_3x3x8::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAn
     gtSysInfo->MaxFillRate = 24;
 };
 
-const HardwareInfo SKL::hwInfo = SKL_1x3x8::hwInfo;
+const HardwareInfo SKL::hwInfo = SklHw1x3x8::hwInfo;
 const uint64_t SKL::defaultHardwareInfoConfig = 0x000100030008;
 
 void setupSKLHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
     if (hwInfoConfig == 0x100030008) {
-        SKL_1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        SklHw1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x200030008) {
-        SKL_2x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        SklHw2x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x300030008) {
-        SKL_3x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        SklHw3x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x100020006) {
-        SKL_1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        SklHw1x2x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x100030006) {
-        SKL_1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        SklHw1x3x6::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else if (hwInfoConfig == 0x0) {
         // Default config
-        SKL_1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        SklHw1x3x8::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else {
         UNRECOVERABLE_IF(true);
     }
diff --git a/shared/source/utilities/reference_tracked_object.h b/shared/source/utilities/reference_tracked_object.h
index 66c7c934ce..918467022e 100644
--- a/shared/source/utilities/reference_tracked_object.h
+++ b/shared/source/utilities/reference_tracked_object.h
@@ -54,7 +54,8 @@ template <typename DerivedClass>
 class ReferenceTrackedObject;
 
 template <typename DataType>
-class unique_ptr_if_unused : public std::unique_ptr<DataType, void (*)(DataType *)> {
+class unique_ptr_if_unused : // NOLINT(readability-identifier-naming)
+                             public std::unique_ptr<DataType, void (*)(DataType *)> {
     using DeleterFuncType = void (*)(DataType *);
 
   public:
diff --git a/shared/source/xe_hp_core/definitions/hw_info_setup_xehp.inl b/shared/source/xe_hp_core/definitions/hw_info_setup_xehp.inl
index 0c64463623..d77a4e62eb 100644
--- a/shared/source/xe_hp_core/definitions/hw_info_setup_xehp.inl
+++ b/shared/source/xe_hp_core/definitions/hw_info_setup_xehp.inl
@@ -1,17 +1,17 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-const HardwareInfo XE_HP_SDV::hwInfo = XE_HP_SDV_CONFIG::hwInfo;
+const HardwareInfo XE_HP_SDV::hwInfo = XehpSdvHwConfig::hwInfo;
 const uint64_t XE_HP_SDV::defaultHardwareInfoConfig = 0;
 
 void setupXEHPHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
     if (hwInfoConfig == 0x0) {
         // Default config
-        XE_HP_SDV_CONFIG::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        XehpSdvHwConfig::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else {
         UNRECOVERABLE_IF(true);
     }
diff --git a/shared/source/xe_hp_core/hw_cmds_xehp.h b/shared/source/xe_hp_core/hw_cmds_xehp.h
index 60c49a88fa..3767fea87f 100644
--- a/shared/source/xe_hp_core/hw_cmds_xehp.h
+++ b/shared/source/xe_hp_core/hw_cmds_xehp.h
@@ -25,7 +25,7 @@ struct XE_HP_SDV : public XeHpFamily {
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
 };
 
-class XE_HP_SDV_CONFIG : public XE_HP_SDV {
+class XehpSdvHwConfig : public XE_HP_SDV {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/xe_hp_core/hw_info_xe_hp_sdv.cpp b/shared/source/xe_hp_core/hw_info_xe_hp_sdv.cpp
index 0a18c99c0d..35bf46f055 100644
--- a/shared/source/xe_hp_core/hw_info_xe_hp_sdv.cpp
+++ b/shared/source/xe_hp_core/hw_info_xe_hp_sdv.cpp
@@ -150,15 +150,15 @@ void XE_HP_SDV::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTab
     }
 }
 
-const HardwareInfo XE_HP_SDV_CONFIG::hwInfo = {
+const HardwareInfo XehpSdvHwConfig::hwInfo = {
     &XE_HP_SDV::platform,
     &XE_HP_SDV::featureTable,
     &XE_HP_SDV::workaroundTable,
-    &XE_HP_SDV_CONFIG::gtSystemInfo,
+    &XehpSdvHwConfig::gtSystemInfo,
     XE_HP_SDV::capabilityTable,
 };
-GT_SYSTEM_INFO XE_HP_SDV_CONFIG::gtSystemInfo = {0};
-void XE_HP_SDV_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO XehpSdvHwConfig::gtSystemInfo = {0};
+void XehpSdvHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
     gtSysInfo->CsrSizeInMb = 8;
     gtSysInfo->IsL3HashModeEnabled = false;
diff --git a/shared/source/xe_hpc_core/definitions/hw_info_setup_pvc.inl b/shared/source/xe_hpc_core/definitions/hw_info_setup_pvc.inl
index 5a3b15cfb6..8f49d163b6 100644
--- a/shared/source/xe_hpc_core/definitions/hw_info_setup_pvc.inl
+++ b/shared/source/xe_hpc_core/definitions/hw_info_setup_pvc.inl
@@ -1,17 +1,17 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
-const HardwareInfo PVC::hwInfo = PVC_CONFIG::hwInfo;
+const HardwareInfo PVC::hwInfo = PvcHwConfig::hwInfo;
 const uint64_t PVC::defaultHardwareInfoConfig = 0;
 
 void setupPVCHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
     if (hwInfoConfig == 0x0) {
         // Default config
-        PVC_CONFIG::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        PvcHwConfig::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else {
         UNRECOVERABLE_IF(true);
     }
diff --git a/shared/source/xe_hpc_core/hw_cmds_pvc.h b/shared/source/xe_hpc_core/hw_cmds_pvc.h
index 2d60ed0b3e..449eb0d355 100644
--- a/shared/source/xe_hpc_core/hw_cmds_pvc.h
+++ b/shared/source/xe_hpc_core/hw_cmds_pvc.h
@@ -51,7 +51,7 @@ struct PVC : public XE_HPC_COREFamily {
     static constexpr uint32_t pvcSteppingBits = 0b111;
 };
 
-class PVC_CONFIG : public PVC {
+class PvcHwConfig : public PVC {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/xe_hpc_core/hw_info_pvc.cpp b/shared/source/xe_hpc_core/hw_info_pvc.cpp
index 31974f4aeb..46f96ee2d4 100644
--- a/shared/source/xe_hpc_core/hw_info_pvc.cpp
+++ b/shared/source/xe_hpc_core/hw_info_pvc.cpp
@@ -178,16 +178,16 @@ void PVC::setupHardwareInfoMultiTileBase(HardwareInfo *hwInfo, bool setupMultiTi
 FeatureTable PVC::featureTable;
 WorkaroundTable PVC::workaroundTable;
 
-const HardwareInfo PVC_CONFIG::hwInfo = {
+const HardwareInfo PvcHwConfig::hwInfo = {
     &PVC::platform,
     &PVC::featureTable,
     &PVC::workaroundTable,
-    &PVC_CONFIG::gtSystemInfo,
+    &PvcHwConfig::gtSystemInfo,
     PVC::capabilityTable,
 };
 
-GT_SYSTEM_INFO PVC_CONFIG::gtSystemInfo = {0};
-void PVC_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO PvcHwConfig::gtSystemInfo = {0};
+void PvcHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
     gtSysInfo->CsrSizeInMb = 8;
     gtSysInfo->IsL3HashModeEnabled = false;
diff --git a/shared/source/xe_hpg_core/definitions/hw_info_setup_dg2.inl b/shared/source/xe_hpg_core/definitions/hw_info_setup_dg2.inl
index 31fb17e688..1424a56551 100644
--- a/shared/source/xe_hpg_core/definitions/hw_info_setup_dg2.inl
+++ b/shared/source/xe_hpg_core/definitions/hw_info_setup_dg2.inl
@@ -5,7 +5,7 @@
  *
  */
 
-const HardwareInfo DG2::hwInfo = DG2_CONFIG::hwInfo;
+const HardwareInfo DG2::hwInfo = Dg2HwConfig::hwInfo;
 const uint64_t DG2::defaultHardwareInfoConfig = 0;
 
 void DG2::adjustHardwareInfo(HardwareInfo *hwInfo) {}
@@ -13,7 +13,7 @@ void DG2::adjustHardwareInfo(HardwareInfo *hwInfo) {}
 void setupDG2HardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
     if (hwInfoConfig == 0x0) {
         // Default config
-        DG2_CONFIG::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        Dg2HwConfig::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else {
         UNRECOVERABLE_IF(true);
     }
diff --git a/shared/source/xe_hpg_core/hw_cmds_dg2.h b/shared/source/xe_hpg_core/hw_cmds_dg2.h
index 0bf65059f8..99a0c35923 100644
--- a/shared/source/xe_hpg_core/hw_cmds_dg2.h
+++ b/shared/source/xe_hpg_core/hw_cmds_dg2.h
@@ -43,7 +43,7 @@ struct DG2 : public XE_HPG_COREFamily {
     }
 };
 
-class DG2_CONFIG : public DG2 {
+class Dg2HwConfig : public DG2 {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static const HardwareInfo hwInfo;
diff --git a/shared/source/xe_hpg_core/hw_info_dg2.cpp b/shared/source/xe_hpg_core/hw_info_dg2.cpp
index 1fabd78baa..a0a0cfe900 100644
--- a/shared/source/xe_hpg_core/hw_info_dg2.cpp
+++ b/shared/source/xe_hpg_core/hw_info_dg2.cpp
@@ -152,15 +152,15 @@ void DG2::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     }
 }
 
-const HardwareInfo DG2_CONFIG::hwInfo = {
+const HardwareInfo Dg2HwConfig::hwInfo = {
     &DG2::platform,
     &DG2::featureTable,
     &DG2::workaroundTable,
-    &DG2_CONFIG::gtSystemInfo,
+    &Dg2HwConfig::gtSystemInfo,
     DG2::capabilityTable,
 };
-GT_SYSTEM_INFO DG2_CONFIG::gtSystemInfo = {0};
-void DG2_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+GT_SYSTEM_INFO Dg2HwConfig::gtSystemInfo = {0};
+void Dg2HwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
     gtSysInfo->CsrSizeInMb = 8;
     gtSysInfo->IsL3HashModeEnabled = false;
diff --git a/shared/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp b/shared/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp
index 20f1ec59c6..9ead404585 100644
--- a/shared/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp
+++ b/shared/test/unit_test/gen11/ehl/linux/hw_info_config_tests_ehl.cpp
@@ -49,7 +49,7 @@ TEST(EhlHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) {
     executionEnvironment->prepareRootDeviceEnvironments(1);
     executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(defaultHwInfo.get());
     DrmMock drm(*executionEnvironment->rootDeviceEnvironments[0]);
-    DeviceDescriptor device = {0, &hwInfo, &EHL_HW_CONFIG::setupHardwareInfo};
+    DeviceDescriptor device = {0, &hwInfo, &EhlHwConfig::setupHardwareInfo};
 
     int ret = drm.setupHardwareInfo(&device, false);
 
diff --git a/shared/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp b/shared/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp
index f5ecbe86de..6029df2eec 100644
--- a/shared/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp
+++ b/shared/test/unit_test/gen11/icllp/linux/hw_info_config_tests_icllp.cpp
@@ -44,7 +44,7 @@ ICLLPTEST_F(HwInfoConfigTestLinuxIcllp, GivenInvalidDeviceIdWhenConfiguringHwInf
 
 template <typename T>
 class IcllpHwInfoTests : public ::testing::Test {};
-typedef ::testing::Types<ICLLP_1x8x8, ICLLP_1x4x8, ICLLP_1x6x8> icllpTestTypes;
+typedef ::testing::Types<IcllpHw1x8x8, IcllpHw1x4x8, IcllpHw1x6x8> icllpTestTypes;
 TYPED_TEST_CASE(IcllpHwInfoTests, icllpTestTypes);
 TYPED_TEST(IcllpHwInfoTests, WhenGettingSystemInfoThenParamsAreValid) {
     auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
diff --git a/shared/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp b/shared/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp
index 44b1fa37c3..65a5e7a767 100644
--- a/shared/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp
+++ b/shared/test/unit_test/gen11/lkf/linux/hw_info_config_tests_lkf.cpp
@@ -45,7 +45,7 @@ LKFTEST_F(HwInfoConfigTestLinuxLkf, negative) {
 
 template <typename T>
 class LkfHwInfoTests : public ::testing::Test {};
-typedef ::testing::Types<LKF_1x8x8> lkfTestTypes;
+typedef ::testing::Types<LkfHw1x8x8> lkfTestTypes;
 TYPED_TEST_CASE(LkfHwInfoTests, lkfTestTypes);
 TYPED_TEST(LkfHwInfoTests, gtSetupIsCorrect) {
     HardwareInfo hwInfo = *defaultHwInfo;
diff --git a/shared/test/unit_test/gen12lp/adln/linux/hw_info_config_tests_adln.cpp b/shared/test/unit_test/gen12lp/adln/linux/hw_info_config_tests_adln.cpp
index 67179e8f03..731a5a576f 100644
--- a/shared/test/unit_test/gen12lp/adln/linux/hw_info_config_tests_adln.cpp
+++ b/shared/test/unit_test/gen12lp/adln/linux/hw_info_config_tests_adln.cpp
@@ -52,7 +52,7 @@ TEST(AdlnHwInfoTests, WhenSettingUpHwInfoThenConfigIsCorrect) {
     executionEnvironment->prepareRootDeviceEnvironments(1);
     executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(defaultHwInfo.get());
     DrmMock drm(*executionEnvironment->rootDeviceEnvironments[0]);
-    DeviceDescriptor device = {0, &hwInfo, &ADLN_CONFIG::setupHardwareInfo};
+    DeviceDescriptor device = {0, &hwInfo, &AdlnHwConfig::setupHardwareInfo};
 
     int ret = drm.setupHardwareInfo(&device, false);
 
diff --git a/shared/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp b/shared/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp
index 032694e9d3..332b91940a 100644
--- a/shared/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp
+++ b/shared/test/unit_test/gen12lp/adlp/linux/hw_info_config_tests_adlp.cpp
@@ -60,7 +60,7 @@ ADLPTEST_F(HwInfoConfigTestLinuxAdlp, givenAdlpConfigWhenSetupHardwareInfoBaseTh
 
 template <typename T>
 using AdlpConfigHwInfoTests = ::testing::Test;
-using adlpConfigTestTypes = ::testing::Types<ADLP_CONFIG>;
+using adlpConfigTestTypes = ::testing::Types<AdlpHwConfig>;
 TYPED_TEST_CASE(AdlpConfigHwInfoTests, adlpConfigTestTypes);
 TYPED_TEST(AdlpConfigHwInfoTests, givenAdlpConfigWhenSetupHardwareInfoThenGtSystemInfoAndWaAndFtrTablesAreSetCorrect) {
     auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
diff --git a/shared/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp b/shared/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp
index c99a5cd637..935cea789a 100644
--- a/shared/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp
+++ b/shared/test/unit_test/gen12lp/adls/linux/hw_info_config_tests_adls.cpp
@@ -52,7 +52,7 @@ TEST(AdlsHwInfoTests, WhenSettingUpHwInfoThenConfigIsCorrect) {
     executionEnvironment->prepareRootDeviceEnvironments(1);
     executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(defaultHwInfo.get());
     DrmMock drm(*executionEnvironment->rootDeviceEnvironments[0]);
-    DeviceDescriptor device = {0, &hwInfo, &ADLS_HW_CONFIG::setupHardwareInfo};
+    DeviceDescriptor device = {0, &hwInfo, &AdlsHwConfig::setupHardwareInfo};
 
     int ret = drm.setupHardwareInfo(&device, false);
 
diff --git a/shared/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp b/shared/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp
index 2d7db4ed83..a039ec578f 100644
--- a/shared/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp
+++ b/shared/test/unit_test/gen12lp/rkl/linux/hw_info_config_tests_rkl.cpp
@@ -52,7 +52,7 @@ TEST(RklHwInfoTests, WhenSettingUpHwInfoThenConfigIsCorrect) {
     executionEnvironment->prepareRootDeviceEnvironments(1);
     executionEnvironment->rootDeviceEnvironments[0]->setHwInfo(defaultHwInfo.get());
     DrmMock drm(*executionEnvironment->rootDeviceEnvironments[0]);
-    DeviceDescriptor device = {0, &hwInfo, &RKL_HW_CONFIG::setupHardwareInfo};
+    DeviceDescriptor device = {0, &hwInfo, &RklHwConfig::setupHardwareInfo};
 
     int ret = drm.setupHardwareInfo(&device, false);
 
diff --git a/shared/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp b/shared/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp
index 0bc1e7a1ae..3a8a02d3c5 100644
--- a/shared/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp
+++ b/shared/test/unit_test/gen12lp/tgllp/linux/hw_info_config_tests_tgllp.cpp
@@ -62,7 +62,7 @@ TGLLPTEST_F(HwInfoConfigTestLinuxTgllp, negative) {
 
 template <typename T>
 class TgllpHwInfoTests : public ::testing::Test {};
-typedef ::testing::Types<TGLLP_1x6x16> tgllpTestTypes;
+typedef ::testing::Types<TgllpHw1x6x16> tgllpTestTypes;
 TYPED_TEST_CASE(TgllpHwInfoTests, tgllpTestTypes);
 TYPED_TEST(TgllpHwInfoTests, gtSetupIsCorrect) {
     auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
diff --git a/shared/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp b/shared/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp
index 3f304c5e15..0f839b650a 100644
--- a/shared/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp
+++ b/shared/test/unit_test/gen8/bdw/linux/hw_info_config_tests_bdw.cpp
@@ -86,7 +86,7 @@ BDWTEST_F(HwInfoConfigTestLinuxBdw, WhenConfiguringHwInfoThenEdramInformationIsC
 template <typename T>
 class BdwHwInfoTests : public ::testing::Test {
 };
-typedef ::testing::Types<BDW_1x2x6, BDW_1x3x6, BDW_1x3x8, BDW_2x3x8> bdwTestTypes;
+typedef ::testing::Types<BdwHw1x2x6, BdwHw1x3x6, BdwHw1x3x8, BdwHw2x3x8> bdwTestTypes;
 TYPED_TEST_CASE(BdwHwInfoTests, bdwTestTypes);
 TYPED_TEST(BdwHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) {
     auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
diff --git a/shared/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp b/shared/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp
index 9edab0dac7..1f63a47d9a 100644
--- a/shared/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp
+++ b/shared/test/unit_test/gen9/bxt/linux/hw_info_config_tests.cpp
@@ -142,7 +142,7 @@ BXTTEST_F(HwInfoConfigTestLinuxBxt, GivenInvalidMinEuInPoolWhenConfiguringHwInfo
 template <typename T>
 class BxtHwInfoTests : public ::testing::Test {
 };
-typedef ::testing::Types<BXT_1x2x6, BXT_1x3x6> bxtTestTypes;
+typedef ::testing::Types<BxtHw1x2x6, BxtHw1x3x6> bxtTestTypes;
 TYPED_TEST_CASE(BxtHwInfoTests, bxtTestTypes);
 TYPED_TEST(BxtHwInfoTests, WhenConfiguringHwInfoThenConfigIsCorrect) {
     auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
diff --git a/shared/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp b/shared/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
index 2a36818528..7c40fd7845 100644
--- a/shared/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
+++ b/shared/test/unit_test/gen9/cfl/linux/hw_info_config_tests_cfl.cpp
@@ -101,7 +101,7 @@ CFLTEST_F(HwInfoConfigTestLinuxCfl, WhenConfiguringHwInfoThenEdramInformationIsC
 template <typename T>
 class CflHwInfoTests : public ::testing::Test {
 };
-typedef ::testing::Types<CFL_1x2x6, CFL_1x3x6, CFL_1x3x8, CFL_2x3x8, CFL_3x3x8> cflTestTypes;
+typedef ::testing::Types<CflHw1x2x6, CflHw1x3x6, CflHw1x3x8, CflHw2x3x8, CflHw3x3x8> cflTestTypes;
 TYPED_TEST_CASE(CflHwInfoTests, cflTestTypes);
 TYPED_TEST(CflHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) {
     auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
diff --git a/shared/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp b/shared/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp
index decd25916e..977dddc432 100644
--- a/shared/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp
+++ b/shared/test/unit_test/gen9/glk/linux/hw_info_config_tests_glk.cpp
@@ -157,7 +157,7 @@ GLKTEST_F(HwInfoConfigTestLinuxGlk, GivenWaFlagsWhenConfiguringHwInfoThenInforma
 template <typename T>
 class GlkHwInfoTests : public ::testing::Test {
 };
-typedef ::testing::Types<GLK_1x3x6, GLK_1x2x6> glkTestTypes;
+typedef ::testing::Types<GlkHw1x3x6, GlkHw1x2x6> glkTestTypes;
 TYPED_TEST_CASE(GlkHwInfoTests, glkTestTypes);
 TYPED_TEST(GlkHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) {
     auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
diff --git a/shared/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp b/shared/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
index 7902a7a8e1..50e28ff460 100644
--- a/shared/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
+++ b/shared/test/unit_test/gen9/kbl/linux/hw_info_config_tests_kbl.cpp
@@ -135,7 +135,7 @@ KBLTEST_F(HwInfoConfigTestLinuxKbl, WhenConfiguringHwInfoThenEdramInformationIsC
 template <typename T>
 class KblHwInfoTests : public ::testing::Test {
 };
-typedef ::testing::Types<KBL_1x2x6, KBL_1x3x6, KBL_1x3x8, KBL_2x3x8, KBL_3x3x8> kblTestTypes;
+typedef ::testing::Types<KblHw1x2x6, KblHw1x3x6, KblHw1x3x8, KblHw2x3x8, KblHw3x3x8> kblTestTypes;
 TYPED_TEST_CASE(KblHwInfoTests, kblTestTypes);
 TYPED_TEST(KblHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) {
     auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
diff --git a/shared/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp b/shared/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp
index b7ee0b2640..7ac845e32e 100644
--- a/shared/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp
+++ b/shared/test/unit_test/gen9/skl/linux/hw_info_config_tests_skl.cpp
@@ -165,7 +165,7 @@ SKLTEST_F(HwInfoConfigTestLinuxSkl, WhenConfiguringHwInfoThenEdramInformationIsC
 template <typename T>
 class SklHwInfoTests : public ::testing::Test {
 };
-typedef ::testing::Types<SKL_1x2x6, SKL_1x3x6, SKL_1x3x8, SKL_2x3x8, SKL_3x3x8> sklTestTypes;
+typedef ::testing::Types<SklHw1x2x6, SklHw1x3x6, SklHw1x3x8, SklHw2x3x8, SklHw3x3x8> sklTestTypes;
 TYPED_TEST_CASE(SklHwInfoTests, sklTestTypes);
 TYPED_TEST(SklHwInfoTests, WhenGtIsSetupThenGtSystemInfoIsCorrect) {
     auto executionEnvironment = std::make_unique<ExecutionEnvironment>();
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp
index 5930aa7428..cc7f98fcf6 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp
@@ -31,7 +31,7 @@ DG2TEST_F(HwInfoConfigTestDg2, whenConvertingTimestampsToCsDomainThenGpuTicksAre
 DG2TEST_F(HwInfoConfigTestDg2, givenDg2ConfigWhenSetupHardwareInfoBaseThenGtSystemInfoIsCorrect) {
     HardwareInfo hwInfo = *defaultHwInfo;
     GT_SYSTEM_INFO &gtSystemInfo = hwInfo.gtSystemInfo;
-    DG2_CONFIG::setupHardwareInfoBase(&hwInfo, false);
+    Dg2HwConfig::setupHardwareInfoBase(&hwInfo, false);
 
     EXPECT_EQ(336u, gtSystemInfo.TotalVsThreads);
     EXPECT_EQ(336u, gtSystemInfo.TotalHsThreads);
@@ -47,7 +47,7 @@ DG2TEST_F(HwInfoConfigTestDg2, givenDg2ConfigWhenSetupHardwareInfoThenGtSystemIn
     HardwareInfo hwInfo = *defaultHwInfo;
     GT_SYSTEM_INFO &gtSystemInfo = hwInfo.gtSystemInfo;
 
-    DG2_CONFIG::setupHardwareInfo(&hwInfo, false);
+    Dg2HwConfig::setupHardwareInfo(&hwInfo, false);
     EXPECT_EQ(8u, gtSystemInfo.CsrSizeInMb);
     EXPECT_FALSE(gtSystemInfo.IsL3HashModeEnabled);
     EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated);