diff --git a/opencl/source/cl_device/cl_device.cpp b/opencl/source/cl_device/cl_device.cpp
index f525d4481b..7209c890ec 100644
--- a/opencl/source/cl_device/cl_device.cpp
+++ b/opencl/source/cl_device/cl_device.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -19,7 +19,7 @@
 #include "shared/source/os_interface/os_interface.h"
 #include "shared/source/source_level_debugger/source_level_debugger.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/platform/platform.h"
 
 namespace NEO {
diff --git a/opencl/source/cl_device/cl_device_caps.cpp b/opencl/source/cl_device/cl_device_caps.cpp
index f0a5b93dcd..71b573cdae 100644
--- a/opencl/source/cl_device/cl_device_caps.cpp
+++ b/opencl/source/cl_device/cl_device_caps.cpp
@@ -13,7 +13,7 @@
 #include "shared/source/os_interface/driver_info.h"
 
 #include "opencl/source/cl_device/cl_device.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/sharings/sharing_factory.h"
 
 #include "driver_version.h"
diff --git a/opencl/source/cl_device/cl_device_info.cpp b/opencl/source/cl_device/cl_device_info.cpp
index 91ce8fb953..b8e9873b41 100644
--- a/opencl/source/cl_device/cl_device_info.cpp
+++ b/opencl/source/cl_device/cl_device_info.cpp
@@ -18,7 +18,7 @@
 #include "opencl/source/cl_device/cl_device_get_cap.inl"
 #include "opencl/source/cl_device/cl_device_info_map.h"
 #include "opencl/source/cl_device/cl_device_vector.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/helpers/get_info_status_mapper.h"
 #include "opencl/source/platform/platform.h"
 
diff --git a/opencl/source/command_queue/command_queue.cpp b/opencl/source/command_queue/command_queue.cpp
index 1bbdfd00b3..248053bd14 100644
--- a/opencl/source/command_queue/command_queue.cpp
+++ b/opencl/source/command_queue/command_queue.cpp
@@ -36,7 +36,7 @@
 #include "opencl/source/event/event_builder.h"
 #include "opencl/source/event/user_event.h"
 #include "opencl/source/gtpin/gtpin_notify.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/helpers/convert_color.h"
 #include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"
diff --git a/opencl/source/command_queue/enqueue_common.h b/opencl/source/command_queue/enqueue_common.h
index cc6b30043b..748c91712d 100644
--- a/opencl/source/command_queue/enqueue_common.h
+++ b/opencl/source/command_queue/enqueue_common.h
@@ -31,7 +31,7 @@
 #include "opencl/source/event/user_event.h"
 #include "opencl/source/gtpin/gtpin_notify.h"
 #include "opencl/source/helpers/cl_blit_properties.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/helpers/cl_preemption_helper.h"
 #include "opencl/source/helpers/dispatch_info_builder.h"
 #include "opencl/source/helpers/enqueue_properties.h"
diff --git a/opencl/source/enable_cores.cmake b/opencl/source/enable_cores.cmake
index 86996ac0b0..b8d19ff140 100644
--- a/opencl/source/enable_cores.cmake
+++ b/opencl/source/enable_cores.cmake
@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 set(RUNTIME_SRCS_COREX_CPP_BASE
     buffer
-    cl_hw_helper
+    cl_gfx_core_helper
     command_queue
     gpgpu_walker
     hardware_commands_helper
diff --git a/opencl/source/gen11/cl_hw_helper_gen11.cpp b/opencl/source/gen11/cl_gfx_core_helper_gen11.cpp
similarity index 70%
rename from opencl/source/gen11/cl_hw_helper_gen11.cpp
rename to opencl/source/gen11/cl_gfx_core_helper_gen11.cpp
index e0ae2e3b12..b91c756415 100644
--- a/opencl/source/gen11/cl_hw_helper_gen11.cpp
+++ b/opencl/source/gen11/cl_gfx_core_helper_gen11.cpp
@@ -8,15 +8,15 @@
 #include "shared/source/gen11/hw_cmds.h"
 #include "shared/source/helpers/populate_factory.h"
 
-#include "opencl/source/helpers/cl_hw_helper_base.inl"
-#include "opencl/source/helpers/cl_hw_helper_bdw_and_later.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_base.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_bdw_and_later.inl"
 
 namespace NEO {
 
 using Family = Gen11Family;
 static auto gfxCore = IGFX_GEN11_CORE;
 
-#include "opencl/source/helpers/cl_hw_helper_factory_init.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_factory_init.inl"
 
 template <>
 cl_version ClGfxCoreHelperHw<Family>::getDeviceIpVersion(const HardwareInfo &hwInfo) const {
diff --git a/opencl/source/gen11/enable_family_full_ocl_gen11.cpp b/opencl/source/gen11/enable_family_full_ocl_gen11.cpp
index 0efc94e1d2..4cdfabb603 100644
--- a/opencl/source/gen11/enable_family_full_ocl_gen11.cpp
+++ b/opencl/source/gen11/enable_family_full_ocl_gen11.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,7 @@
 #include "shared/source/helpers/populate_factory.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/sampler/sampler.h"
diff --git a/opencl/source/gen12lp/cl_hw_helper_gen12lp.cpp b/opencl/source/gen12lp/cl_gfx_core_helper_gen12lp.cpp
similarity index 79%
rename from opencl/source/gen12lp/cl_hw_helper_gen12lp.cpp
rename to opencl/source/gen12lp/cl_gfx_core_helper_gen12lp.cpp
index bb35537a4f..c3f4953fc0 100644
--- a/opencl/source/gen12lp/cl_hw_helper_gen12lp.cpp
+++ b/opencl/source/gen12lp/cl_gfx_core_helper_gen12lp.cpp
@@ -9,15 +9,15 @@
 #include "shared/source/gen12lp/hw_cmds.h"
 #include "shared/source/helpers/populate_factory.h"
 
-#include "opencl/source/helpers/cl_hw_helper_base.inl"
-#include "opencl/source/helpers/cl_hw_helper_bdw_and_later.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_base.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_bdw_and_later.inl"
 
 namespace NEO {
 
 using Family = Gen12LpFamily;
 static auto gfxCore = IGFX_GEN12LP_CORE;
 
-#include "opencl/source/helpers/cl_hw_helper_factory_init.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_factory_init.inl"
 
 template <>
 cl_device_feature_capabilities_intel ClGfxCoreHelperHw<Family>::getSupportedDeviceFeatureCapabilities(const RootDeviceEnvironment &rootDeviceEnvironment) const {
diff --git a/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp b/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp
index 79938ae226..784c87c993 100644
--- a/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp
+++ b/opencl/source/gen12lp/enable_family_full_ocl_gen12lp.cpp
@@ -10,7 +10,7 @@
 #include "shared/source/helpers/populate_factory.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/sampler/sampler.h"
diff --git a/opencl/source/gen8/cl_hw_helper_gen8.cpp b/opencl/source/gen8/cl_gfx_core_helper_gen8.cpp
similarity index 73%
rename from opencl/source/gen8/cl_hw_helper_gen8.cpp
rename to opencl/source/gen8/cl_gfx_core_helper_gen8.cpp
index bf3cdbaf43..a716b49616 100644
--- a/opencl/source/gen8/cl_hw_helper_gen8.cpp
+++ b/opencl/source/gen8/cl_gfx_core_helper_gen8.cpp
@@ -9,15 +9,15 @@
 #include "shared/source/gen8/hw_cmds.h"
 #include "shared/source/helpers/populate_factory.h"
 
-#include "opencl/source/helpers/cl_hw_helper_base.inl"
-#include "opencl/source/helpers/cl_hw_helper_bdw_and_later.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_base.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_bdw_and_later.inl"
 
 namespace NEO {
 
 using Family = Gen8Family;
 static auto gfxCore = IGFX_GEN8_CORE;
 
-#include "opencl/source/helpers/cl_hw_helper_factory_init.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_factory_init.inl"
 
 template <>
 cl_version ClGfxCoreHelperHw<Family>::getDeviceIpVersion(const HardwareInfo &hwInfo) const {
diff --git a/opencl/source/gen8/enable_family_full_ocl_gen8.cpp b/opencl/source/gen8/enable_family_full_ocl_gen8.cpp
index 4406a54cd6..03a3d1238e 100644
--- a/opencl/source/gen8/enable_family_full_ocl_gen8.cpp
+++ b/opencl/source/gen8/enable_family_full_ocl_gen8.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,7 @@
 #include "shared/source/helpers/populate_factory.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/sampler/sampler.h"
diff --git a/opencl/source/gen9/cl_hw_helper_gen9.cpp b/opencl/source/gen9/cl_gfx_core_helper_gen9.cpp
similarity index 73%
rename from opencl/source/gen9/cl_hw_helper_gen9.cpp
rename to opencl/source/gen9/cl_gfx_core_helper_gen9.cpp
index ce70c00a22..585a4e464f 100644
--- a/opencl/source/gen9/cl_hw_helper_gen9.cpp
+++ b/opencl/source/gen9/cl_gfx_core_helper_gen9.cpp
@@ -9,15 +9,15 @@
 #include "shared/source/gen9/hw_cmds.h"
 #include "shared/source/helpers/populate_factory.h"
 
-#include "opencl/source/helpers/cl_hw_helper_base.inl"
-#include "opencl/source/helpers/cl_hw_helper_bdw_and_later.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_base.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_bdw_and_later.inl"
 
 namespace NEO {
 
 using Family = Gen9Family;
 static auto gfxCore = IGFX_GEN9_CORE;
 
-#include "opencl/source/helpers/cl_hw_helper_factory_init.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_factory_init.inl"
 
 template <>
 cl_version ClGfxCoreHelperHw<Family>::getDeviceIpVersion(const HardwareInfo &hwInfo) const {
diff --git a/opencl/source/gen9/enable_family_full_ocl_gen9.cpp b/opencl/source/gen9/enable_family_full_ocl_gen9.cpp
index 40ce1653ef..a3bf9e1bd3 100644
--- a/opencl/source/gen9/enable_family_full_ocl_gen9.cpp
+++ b/opencl/source/gen9/enable_family_full_ocl_gen9.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020-2022 Intel Corporation
+ * Copyright (C) 2020-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,7 @@
 #include "shared/source/helpers/populate_factory.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/sampler/sampler.h"
diff --git a/opencl/source/helpers/CMakeLists.txt b/opencl/source/helpers/CMakeLists.txt
index 4ef2f48ef7..2947894f9c 100644
--- a/opencl/source/helpers/CMakeLists.txt
+++ b/opencl/source/helpers/CMakeLists.txt
@@ -10,11 +10,11 @@ set(RUNTIME_SRCS_HELPERS_BASE
     ${CMAKE_CURRENT_SOURCE_DIR}/base_object.h
     ${CMAKE_CURRENT_SOURCE_DIR}/cl_blit_properties.h
     ${CMAKE_CURRENT_SOURCE_DIR}/cl_helper.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper.h
-    ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_base.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_bdw_and_later.inl
-    ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_factory_init.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/cl_gfx_core_helper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/cl_gfx_core_helper.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/cl_gfx_core_helper_base.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/cl_gfx_core_helper_bdw_and_later.inl
+    ${CMAKE_CURRENT_SOURCE_DIR}/cl_gfx_core_helper_factory_init.inl
     ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}cl_memory_properties_helpers.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/cl_memory_properties_helpers.h
     ${CMAKE_CURRENT_SOURCE_DIR}/cl_memory_properties_helpers_base.inl
@@ -52,13 +52,13 @@ set(RUNTIME_SRCS_HELPERS_BASE
 
 if(SUPPORT_XEHP_AND_LATER)
   list(APPEND RUNTIME_SRCS_HELPERS_BASE
-       ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_xehp_and_later.inl
+       ${CMAKE_CURRENT_SOURCE_DIR}/cl_gfx_core_helper_xehp_and_later.inl
        ${CMAKE_CURRENT_SOURCE_DIR}/hardware_commands_helper_xehp_and_later.inl
   )
 endif()
 
 if(SUPPORT_PVC_AND_LATER)
-  list(APPEND RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_pvc_and_later.inl)
+  list(APPEND RUNTIME_SRCS_HELPERS_BASE ${CMAKE_CURRENT_SOURCE_DIR}/cl_gfx_core_helper_pvc_and_later.inl)
 endif()
 
 set(RUNTIME_SRCS_HELPERS_WINDOWS
diff --git a/opencl/source/helpers/cl_hw_helper.cpp b/opencl/source/helpers/cl_gfx_core_helper.cpp
similarity index 95%
rename from opencl/source/helpers/cl_hw_helper.cpp
rename to opencl/source/helpers/cl_gfx_core_helper.cpp
index 2b7cb6ae5b..a9bdc534d1 100644
--- a/opencl/source/helpers/cl_hw_helper.cpp
+++ b/opencl/source/helpers/cl_gfx_core_helper.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/helpers/hw_info.h"
diff --git a/opencl/source/helpers/cl_hw_helper.h b/opencl/source/helpers/cl_gfx_core_helper.h
similarity index 100%
rename from opencl/source/helpers/cl_hw_helper.h
rename to opencl/source/helpers/cl_gfx_core_helper.h
diff --git a/opencl/source/helpers/cl_hw_helper_base.inl b/opencl/source/helpers/cl_gfx_core_helper_base.inl
similarity index 97%
rename from opencl/source/helpers/cl_hw_helper_base.inl
rename to opencl/source/helpers/cl_gfx_core_helper_base.inl
index ab6500c1cf..6ca0d5b9a5 100644
--- a/opencl/source/helpers/cl_hw_helper_base.inl
+++ b/opencl/source/helpers/cl_gfx_core_helper_base.inl
@@ -8,7 +8,7 @@
 #include "shared/source/helpers/hw_helper.h"
 #include "shared/source/program/kernel_info.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/helpers/dispatch_info.h"
 
 namespace NEO {
diff --git a/opencl/source/helpers/cl_hw_helper_bdw_and_later.inl b/opencl/source/helpers/cl_gfx_core_helper_bdw_and_later.inl
similarity index 96%
rename from opencl/source/helpers/cl_hw_helper_bdw_and_later.inl
rename to opencl/source/helpers/cl_gfx_core_helper_bdw_and_later.inl
index f3093d8ec4..50a413000c 100644
--- a/opencl/source/helpers/cl_hw_helper_bdw_and_later.inl
+++ b/opencl/source/helpers/cl_gfx_core_helper_bdw_and_later.inl
@@ -5,7 +5,7 @@
  *
  */
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/helpers/surface_formats.h"
 
 namespace NEO {
diff --git a/opencl/source/helpers/cl_hw_helper_factory_init.inl b/opencl/source/helpers/cl_gfx_core_helper_factory_init.inl
similarity index 100%
rename from opencl/source/helpers/cl_hw_helper_factory_init.inl
rename to opencl/source/helpers/cl_gfx_core_helper_factory_init.inl
diff --git a/opencl/source/helpers/cl_hw_helper_pvc_and_later.inl b/opencl/source/helpers/cl_gfx_core_helper_pvc_and_later.inl
similarity index 95%
rename from opencl/source/helpers/cl_hw_helper_pvc_and_later.inl
rename to opencl/source/helpers/cl_gfx_core_helper_pvc_and_later.inl
index b83875ca51..bd7c70e2c3 100644
--- a/opencl/source/helpers/cl_hw_helper_pvc_and_later.inl
+++ b/opencl/source/helpers/cl_gfx_core_helper_pvc_and_later.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
diff --git a/opencl/source/helpers/cl_hw_helper_xehp_and_later.inl b/opencl/source/helpers/cl_gfx_core_helper_xehp_and_later.inl
similarity index 96%
rename from opencl/source/helpers/cl_hw_helper_xehp_and_later.inl
rename to opencl/source/helpers/cl_gfx_core_helper_xehp_and_later.inl
index af0ba9bb58..29d17eb755 100644
--- a/opencl/source/helpers/cl_hw_helper_xehp_and_later.inl
+++ b/opencl/source/helpers/cl_gfx_core_helper_xehp_and_later.inl
@@ -8,7 +8,7 @@
 #include "shared/source/execution_environment/root_device_environment.h"
 #include "shared/source/os_interface/hw_info_config.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 
 namespace NEO {
 
diff --git a/opencl/source/kernel/kernel.cpp b/opencl/source/kernel/kernel.cpp
index 22b359c316..89a5af10eb 100644
--- a/opencl/source/kernel/kernel.cpp
+++ b/opencl/source/kernel/kernel.cpp
@@ -48,7 +48,7 @@
 #include "opencl/source/context/context.h"
 #include "opencl/source/event/event.h"
 #include "opencl/source/gtpin/gtpin_notify.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/helpers/dispatch_info.h"
 #include "opencl/source/helpers/get_info_status_mapper.h"
diff --git a/opencl/source/mem_obj/image.cpp b/opencl/source/mem_obj/image.cpp
index ce23e17739..f895354d3c 100644
--- a/opencl/source/mem_obj/image.cpp
+++ b/opencl/source/mem_obj/image.cpp
@@ -26,7 +26,7 @@
 #include "opencl/source/cl_device/cl_device_get_cap.inl"
 #include "opencl/source/command_queue/command_queue.h"
 #include "opencl/source/context/context.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
 #include "opencl/source/helpers/cl_validators.h"
 #include "opencl/source/helpers/get_info_status_mapper.h"
diff --git a/opencl/source/mem_obj/mem_obj_helper.cpp b/opencl/source/mem_obj/mem_obj_helper.cpp
index 4ccbc4333b..55c0707ac5 100644
--- a/opencl/source/mem_obj/mem_obj_helper.cpp
+++ b/opencl/source/mem_obj/mem_obj_helper.cpp
@@ -14,7 +14,7 @@
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/context/context.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 
 namespace NEO {
 
diff --git a/opencl/source/xe_hp_core/cl_hw_helper_xe_hp_core.cpp b/opencl/source/xe_hp_core/cl_gfx_core_helper_xe_hp_core.cpp
similarity index 93%
rename from opencl/source/xe_hp_core/cl_hw_helper_xe_hp_core.cpp
rename to opencl/source/xe_hp_core/cl_gfx_core_helper_xe_hp_core.cpp
index c40474979c..0fb151d6fb 100644
--- a/opencl/source/xe_hp_core/cl_hw_helper_xe_hp_core.cpp
+++ b/opencl/source/xe_hp_core/cl_gfx_core_helper_xe_hp_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -12,8 +12,8 @@
 #include "shared/source/xe_hp_core/hw_cmds.h"
 
 #include "opencl/source/context/context.h"
-#include "opencl/source/helpers/cl_hw_helper_base.inl"
-#include "opencl/source/helpers/cl_hw_helper_xehp_and_later.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_base.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_xehp_and_later.inl"
 
 namespace NEO {
 
diff --git a/opencl/source/xe_hp_core/enable_family_full_ocl_xe_hp_core.cpp b/opencl/source/xe_hp_core/enable_family_full_ocl_xe_hp_core.cpp
index 303ab5ce89..19cb39f64f 100644
--- a/opencl/source/xe_hp_core/enable_family_full_ocl_xe_hp_core.cpp
+++ b/opencl/source/xe_hp_core/enable_family_full_ocl_xe_hp_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,7 @@
 #include "shared/source/xe_hp_core/hw_cmds.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/sampler/sampler.h"
diff --git a/opencl/source/xe_hpc_core/cl_hw_helper_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/cl_gfx_core_helper_xe_hpc_core.cpp
similarity index 70%
rename from opencl/source/xe_hpc_core/cl_hw_helper_xe_hpc_core.cpp
rename to opencl/source/xe_hpc_core/cl_gfx_core_helper_xe_hpc_core.cpp
index 02d35faf76..fe79524b00 100644
--- a/opencl/source/xe_hpc_core/cl_hw_helper_xe_hpc_core.cpp
+++ b/opencl/source/xe_hpc_core/cl_gfx_core_helper_xe_hpc_core.cpp
@@ -8,16 +8,16 @@
 #include "shared/source/helpers/populate_factory.h"
 #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
-#include "opencl/source/helpers/cl_hw_helper_base.inl"
-#include "opencl/source/helpers/cl_hw_helper_xehp_and_later.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_base.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_xehp_and_later.inl"
 
 namespace NEO {
 
 using Family = XeHpcCoreFamily;
 static auto gfxCore = IGFX_XE_HPC_CORE;
 
-#include "opencl/source/helpers/cl_hw_helper_factory_init.inl"
-#include "opencl/source/helpers/cl_hw_helper_pvc_and_later.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_factory_init.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_pvc_and_later.inl"
 
 template <>
 bool ClGfxCoreHelperHw<Family>::requiresAuxResolves(const KernelInfo &kernelInfo) const {
diff --git a/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp b/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp
index 4a221e6cd0..bcaf01f32f 100644
--- a/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp
+++ b/opencl/source/xe_hpc_core/enable_family_full_ocl_xe_hpc_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,7 @@
 #include "shared/source/xe_hpc_core/hw_cmds_xe_hpc_core_base.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/sampler/sampler.h"
diff --git a/opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/cl_gfx_core_helper_xe_hpg_core.cpp
similarity index 92%
rename from opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp
rename to opencl/source/xe_hpg_core/cl_gfx_core_helper_xe_hpg_core.cpp
index dfd7c2189e..9c9d60e362 100644
--- a/opencl/source/xe_hpg_core/cl_hw_helper_xe_hpg_core.cpp
+++ b/opencl/source/xe_hpg_core/cl_gfx_core_helper_xe_hpg_core.cpp
@@ -13,8 +13,8 @@
 #include "shared/source/os_interface/hw_info_config.h"
 #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
-#include "opencl/source/helpers/cl_hw_helper_base.inl"
-#include "opencl/source/helpers/cl_hw_helper_xehp_and_later.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_base.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_xehp_and_later.inl"
 #include "opencl/source/helpers/surface_formats.h"
 
 namespace NEO {
@@ -22,7 +22,7 @@ namespace NEO {
 using Family = XeHpgCoreFamily;
 static auto gfxCore = IGFX_XE_HPG_CORE;
 
-#include "opencl/source/helpers/cl_hw_helper_factory_init.inl"
+#include "opencl/source/helpers/cl_gfx_core_helper_factory_init.inl"
 
 template <>
 bool ClGfxCoreHelperHw<Family>::requiresNonAuxMode(const ArgDescPointer &argAsPtr) const {
diff --git a/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp b/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp
index bd5d351690..41f0a253c3 100644
--- a/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp
+++ b/opencl/source/xe_hpg_core/enable_family_full_ocl_xe_hpg_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -9,7 +9,7 @@
 #include "shared/source/xe_hpg_core/hw_cmds_xe_hpg_core_base.h"
 
 #include "opencl/source/command_queue/command_queue_hw.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/source/sampler/sampler.h"
diff --git a/opencl/test/unit_test/api/cl_get_device_info_tests.inl b/opencl/test/unit_test/api/cl_get_device_info_tests.inl
index 60bee28cc2..0fb6038c73 100644
--- a/opencl/test/unit_test/api/cl_get_device_info_tests.inl
+++ b/opencl/test/unit_test/api/cl_get_device_info_tests.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #include "shared/source/helpers/hw_info.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 
 #include "cl_api_tests.h"
 
diff --git a/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl b/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl
index fcbff3c77c..9745c0c944 100644
--- a/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl
+++ b/opencl/test/unit_test/api/cl_set_kernel_exec_info_tests.inl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #include "shared/test/common/test_macros/test.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.h"
 #include "opencl/test/unit_test/mocks/mock_kernel.h"
 
diff --git a/opencl/test/unit_test/command_queue/command_queue_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_tests.cpp
index c60007aa06..9cc763af6f 100644
--- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp
+++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp
@@ -36,7 +36,7 @@
 #include "opencl/source/command_queue/command_queue_hw.h"
 #include "opencl/source/event/event.h"
 #include "opencl/source/event/user_event.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/helpers/hardware_commands_helper.h"
 #include "opencl/test/unit_test/command_queue/command_queue_fixture.h"
 #include "opencl/test/unit_test/command_stream/command_stream_fixture.h"
diff --git a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp
index 60038f3c51..7c8e4c1597 100644
--- a/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp
+++ b/opencl/test/unit_test/command_queue/enqueue_handler_tests.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2018-2022 Intel Corporation
+ * Copyright (C) 2018-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -21,7 +21,7 @@
 #include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/event/user_event.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/platform/platform.h"
 #include "opencl/test/unit_test/command_stream/thread_arbitration_policy_helper.h"
 #include "opencl/test/unit_test/fixtures/enqueue_handler_fixture.h"
diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp
index 2841db9dae..3317d6aa5a 100644
--- a/opencl/test/unit_test/device/device_caps_tests.cpp
+++ b/opencl/test/unit_test/device/device_caps_tests.cpp
@@ -25,7 +25,7 @@
 #include "shared/test/common/mocks/mock_sip.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/fixtures/device_info_fixture.h"
 #include "opencl/test/unit_test/mocks/ult_cl_device_factory.h"
 #include "opencl/test/unit_test/test_macros/test_checks_ocl.h"
diff --git a/opencl/test/unit_test/device/get_device_info_tests.cpp b/opencl/test/unit_test/device/get_device_info_tests.cpp
index 5f9e48ce12..c7a8a9589f 100644
--- a/opencl/test/unit_test/device/get_device_info_tests.cpp
+++ b/opencl/test/unit_test/device/get_device_info_tests.cpp
@@ -14,7 +14,7 @@
 #include "shared/test/common/test_macros/hw_test.h"
 
 #include "opencl/source/cl_device/cl_device_info_map.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/fixtures/device_info_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h"
diff --git a/opencl/test/unit_test/fixtures/cl_device_fixture.cpp b/opencl/test/unit_test/fixtures/cl_device_fixture.cpp
index 496c236603..68a69e92b6 100644
--- a/opencl/test/unit_test/fixtures/cl_device_fixture.cpp
+++ b/opencl/test/unit_test/fixtures/cl_device_fixture.cpp
@@ -9,7 +9,7 @@
 
 #include "shared/source/built_ins/sip.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
 #include "opencl/test/unit_test/mocks/mock_cl_execution_environment.h"
 
diff --git a/opencl/test/unit_test/gen11/CMakeLists.txt b/opencl/test/unit_test/gen11/CMakeLists.txt
index 984049b9a4..29bfba4b2b 100644
--- a/opencl/test/unit_test/gen11/CMakeLists.txt
+++ b/opencl/test/unit_test/gen11/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2019-2022 Intel Corporation
+# Copyright (C) 2019-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -7,7 +7,7 @@
 if(TESTS_GEN11)
   set(IGDRCL_SRCS_tests_gen11
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-      ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_tests_gen11.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/cl_gfx_core_helper_tests_gen11.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_tests_gen11.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_gen11.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_media_kernel_gen11.cpp
diff --git a/opencl/test/unit_test/gen11/cl_hw_helper_tests_gen11.cpp b/opencl/test/unit_test/gen11/cl_gfx_core_helper_tests_gen11.cpp
similarity index 89%
rename from opencl/test/unit_test/gen11/cl_hw_helper_tests_gen11.cpp
rename to opencl/test/unit_test/gen11/cl_gfx_core_helper_tests_gen11.cpp
index cfff1513cf..5a13f8953d 100644
--- a/opencl/test/unit_test/gen11/cl_hw_helper_tests_gen11.cpp
+++ b/opencl/test/unit_test/gen11/cl_gfx_core_helper_tests_gen11.cpp
@@ -10,9 +10,9 @@
 #include "shared/test/common/helpers/hw_helper_tests.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
-#include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h"
+#include "opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h"
 
 using ClGfxCoreHelperTestGen11 = Test<ClDeviceFixture>;
 
diff --git a/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl
index aa8324d109..510f223ee6 100644
--- a/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl
+++ b/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl
@@ -12,9 +12,9 @@
 #include "shared/test/common/libult/gen12lp/special_ult_helper_gen12lp.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
-#include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h"
+#include "opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 
diff --git a/opencl/test/unit_test/gen8/CMakeLists.txt b/opencl/test/unit_test/gen8/CMakeLists.txt
index 70e205da16..52ee1ee838 100644
--- a/opencl/test/unit_test/gen8/CMakeLists.txt
+++ b/opencl/test/unit_test/gen8/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2021 Intel Corporation
+# Copyright (C) 2018-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -8,7 +8,7 @@ if(TESTS_GEN8)
   set(IGDRCL_SRCS_tests_gen8
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_tests_gen8.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_tests_gen8.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/cl_gfx_core_helper_tests_gen8.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_media_kernel_gen8.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/image_tests_gen8.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/kernel_tests_gen8.cpp
diff --git a/opencl/test/unit_test/gen8/cl_hw_helper_tests_gen8.cpp b/opencl/test/unit_test/gen8/cl_gfx_core_helper_tests_gen8.cpp
similarity index 89%
rename from opencl/test/unit_test/gen8/cl_hw_helper_tests_gen8.cpp
rename to opencl/test/unit_test/gen8/cl_gfx_core_helper_tests_gen8.cpp
index d336510c1c..170931b0b1 100644
--- a/opencl/test/unit_test/gen8/cl_hw_helper_tests_gen8.cpp
+++ b/opencl/test/unit_test/gen8/cl_gfx_core_helper_tests_gen8.cpp
@@ -11,9 +11,9 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
-#include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h"
+#include "opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h"
 
 using namespace NEO;
 using ClGfxCoreHelperTestGen8 = Test<ClDeviceFixture>;
diff --git a/opencl/test/unit_test/gen9/CMakeLists.txt b/opencl/test/unit_test/gen9/CMakeLists.txt
index fafdcf6cbf..e0db621310 100644
--- a/opencl/test/unit_test/gen9/CMakeLists.txt
+++ b/opencl/test/unit_test/gen9/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -8,7 +8,7 @@ if(TESTS_GEN9)
   set(IGDRCL_SRCS_tests_gen9
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/cl_get_platform_ids_tests_gen9.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_tests_gen9.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/cl_gfx_core_helper_tests_gen9.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_tests_gen9.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_kernel_gen9.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/enqueue_media_kernel_gen9.cpp
diff --git a/opencl/test/unit_test/gen9/cl_hw_helper_tests_gen9.cpp b/opencl/test/unit_test/gen9/cl_gfx_core_helper_tests_gen9.cpp
similarity index 93%
rename from opencl/test/unit_test/gen9/cl_hw_helper_tests_gen9.cpp
rename to opencl/test/unit_test/gen9/cl_gfx_core_helper_tests_gen9.cpp
index a58ffe000f..02a3b6c99c 100644
--- a/opencl/test/unit_test/gen9/cl_hw_helper_tests_gen9.cpp
+++ b/opencl/test/unit_test/gen9/cl_gfx_core_helper_tests_gen9.cpp
@@ -11,7 +11,7 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
-#include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h"
+#include "opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h"
 
 using ClGfxCoreHelperTestGen9 = Test<ClDeviceFixture>;
 
diff --git a/opencl/test/unit_test/helpers/CMakeLists.txt b/opencl/test/unit_test/helpers/CMakeLists.txt
index 6f6ffbaed6..34731de919 100644
--- a/opencl/test/unit_test/helpers/CMakeLists.txt
+++ b/opencl/test/unit_test/helpers/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018-2022 Intel Corporation
+# Copyright (C) 2018-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -31,7 +31,7 @@ set(IGDRCL_SRCS_tests_helpers
 
 if(TESTS_XEHP_AND_LATER)
   list(APPEND IGDRCL_SRCS_tests_helpers
-       ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_tests_xehp_and_later.cpp
+       ${CMAKE_CURRENT_SOURCE_DIR}/cl_gfx_core_helper_tests_xehp_and_later.cpp
        ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xehp_and_later.cpp
   )
 endif()
diff --git a/opencl/test/unit_test/helpers/cl_hw_helper_tests_xehp_and_later.cpp b/opencl/test/unit_test/helpers/cl_gfx_core_helper_tests_xehp_and_later.cpp
similarity index 96%
rename from opencl/test/unit_test/helpers/cl_hw_helper_tests_xehp_and_later.cpp
rename to opencl/test/unit_test/helpers/cl_gfx_core_helper_tests_xehp_and_later.cpp
index 52394f2542..45f79ff3bd 100644
--- a/opencl/test/unit_test/helpers/cl_hw_helper_tests_xehp_and_later.cpp
+++ b/opencl/test/unit_test/helpers/cl_gfx_core_helper_tests_xehp_and_later.cpp
@@ -8,7 +8,7 @@
 #include "shared/test/common/helpers/hw_helper_tests.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
diff --git a/opencl/test/unit_test/helpers/cl_helper_tests.cpp b/opencl/test/unit_test/helpers/cl_helper_tests.cpp
index c09187716c..c17f6a84a4 100644
--- a/opencl/test/unit_test/helpers/cl_helper_tests.cpp
+++ b/opencl/test/unit_test/helpers/cl_helper_tests.cpp
@@ -14,8 +14,8 @@
 #include "shared/test/common/helpers/unit_test_helper.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/helpers/cl_helper.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
 #include "opencl/source/mem_obj/buffer.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp
index 1f48eec60e..f4b410c5dc 100644
--- a/opencl/test/unit_test/kernel/kernel_tests.cpp
+++ b/opencl/test/unit_test/kernel/kernel_tests.cpp
@@ -32,7 +32,7 @@
 #include "shared/test/common/utilities/base_object_utils.h"
 
 #include "opencl/source/built_ins/builtins_dispatch_builder.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
 #include "opencl/source/kernel/kernel.h"
 #include "opencl/source/mem_obj/image.h"
diff --git a/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp b/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp
index c4b1a4c128..b16fa70e0b 100644
--- a/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/buffer_bcs_tests.cpp
@@ -21,7 +21,7 @@
 #include "opencl/source/api/api.h"
 #include "opencl/source/event/user_event.h"
 #include "opencl/source/helpers/cl_blit_properties.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_buffer.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
diff --git a/opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp b/opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp
index f60b1c1d91..b49b1f4c4d 100644
--- a/opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp
+++ b/opencl/test/unit_test/mem_obj/mem_obj_helper_tests.cpp
@@ -12,7 +12,7 @@
 #include "shared/test/common/mocks/ult_device_factory.h"
 #include "shared/test/common/utilities/base_object_utils.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
 #include "opencl/source/mem_obj/mem_obj_helper.h"
 #include "opencl/test/unit_test/fixtures/image_fixture.h"
diff --git a/opencl/test/unit_test/mocks/mock_cl_hw_helper.h b/opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h
similarity index 71%
rename from opencl/test/unit_test/mocks/mock_cl_hw_helper.h
rename to opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h
index 04ad9856bb..7fa2d247c7 100644
--- a/opencl/test/unit_test/mocks/mock_cl_hw_helper.h
+++ b/opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2021-2022 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
  */
 
 #pragma once
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 
 namespace NEO {
 
diff --git a/opencl/test/unit_test/test_macros/test_checks_ocl.cpp b/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
index f3ed4331ec..d9ef24c91e 100644
--- a/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
+++ b/opencl/test/unit_test/test_macros/test_checks_ocl.cpp
@@ -18,7 +18,7 @@
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/source/context/context.h"
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/kernel/kernel.h"
 
 using namespace NEO;
diff --git a/opencl/test/unit_test/xe_hp_core/hw_helper_tests_xe_hp_core.cpp b/opencl/test/unit_test/xe_hp_core/hw_helper_tests_xe_hp_core.cpp
index 383f051054..96a4c2d74b 100644
--- a/opencl/test/unit_test/xe_hp_core/hw_helper_tests_xe_hp_core.cpp
+++ b/opencl/test/unit_test/xe_hp_core/hw_helper_tests_xe_hp_core.cpp
@@ -18,9 +18,9 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/hw_test.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
-#include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h"
+#include "opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h"
 
 using ClGfxCoreHelperTestsXeHpCore = Test<ClDeviceFixture>;
 
diff --git a/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp
index c4088ec560..ff9d495325 100644
--- a/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp
+++ b/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp
@@ -18,10 +18,10 @@
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
 #include "opencl/test/unit_test/mocks/mock_cl_device.h"
-#include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h"
+#include "opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/mocks/mock_platform.h"
 
 #include "hw_cmds_xe_hpc_core_base.h"
diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt b/opencl/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt
index 3e2576a781..7eb87070b3 100644
--- a/opencl/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt
+++ b/opencl/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021-2022 Intel Corporation
+# Copyright (C) 2021-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -7,7 +7,7 @@
 if(TESTS_PVC)
   set(IGDRCL_SRCS_tests_xe_hpc_core_pvc
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-      ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_tests_pvc.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/cl_gfx_core_helper_tests_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_tests_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/get_device_info_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_cl_device_caps_pvc.cpp
diff --git a/opencl/test/unit_test/xe_hpc_core/pvc/cl_hw_helper_tests_pvc.cpp b/opencl/test/unit_test/xe_hpc_core/pvc/cl_gfx_core_helper_tests_pvc.cpp
similarity index 100%
rename from opencl/test/unit_test/xe_hpc_core/pvc/cl_hw_helper_tests_pvc.cpp
rename to opencl/test/unit_test/xe_hpc_core/pvc/cl_gfx_core_helper_tests_pvc.cpp
diff --git a/opencl/test/unit_test/xe_hpg_core/CMakeLists.txt b/opencl/test/unit_test/xe_hpg_core/CMakeLists.txt
index 3672ba374c..451bcaebe1 100644
--- a/opencl/test/unit_test/xe_hpg_core/CMakeLists.txt
+++ b/opencl/test/unit_test/xe_hpg_core/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2021-2022 Intel Corporation
+# Copyright (C) 2021-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
@@ -13,7 +13,7 @@ if(TESTS_XE_HPG_CORE)
   set(IGDRCL_SRCS_tests_xe_hpg_core
       ${IGDRCL_SRCS_tests_xe_hpg_core_excludes}
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-      ${CMAKE_CURRENT_SOURCE_DIR}/cl_hw_helper_tests_xe_hpg_core.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/cl_gfx_core_helper_tests_xe_hpg_core.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/command_stream_receiver_hw_tests_xe_hpg_core.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/copy_engine_tests_xe_hpg_core.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/image_tests_xe_hpg_core.cpp
diff --git a/opencl/test/unit_test/xe_hpg_core/cl_hw_helper_tests_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/cl_gfx_core_helper_tests_xe_hpg_core.cpp
similarity index 98%
rename from opencl/test/unit_test/xe_hpg_core/cl_hw_helper_tests_xe_hpg_core.cpp
rename to opencl/test/unit_test/xe_hpg_core/cl_gfx_core_helper_tests_xe_hpg_core.cpp
index 944c39f8f5..d96644d0db 100644
--- a/opencl/test/unit_test/xe_hpg_core/cl_hw_helper_tests_xe_hpg_core.cpp
+++ b/opencl/test/unit_test/xe_hpg_core/cl_gfx_core_helper_tests_xe_hpg_core.cpp
@@ -13,7 +13,7 @@
 
 #include "opencl/source/cl_device/cl_device.h"
 #include "opencl/test/unit_test/fixtures/cl_device_fixture.h"
-#include "opencl/test/unit_test/mocks/mock_cl_hw_helper.h"
+#include "opencl/test/unit_test/mocks/mock_cl_gfx_core_helper.h"
 #include "opencl/test/unit_test/mocks/mock_context.h"
 
 #include "hw_cmds_xe_hpg_core_base.h"
diff --git a/opencl/test/unit_test/xe_hpg_core/image_tests_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/image_tests_xe_hpg_core.cpp
index 1b572a6054..f6b7f70cd1 100644
--- a/opencl/test/unit_test/xe_hpg_core/image_tests_xe_hpg_core.cpp
+++ b/opencl/test/unit_test/xe_hpg_core/image_tests_xe_hpg_core.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2023 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,7 +7,7 @@
 
 #include "shared/test/common/helpers/unit_test_helper.h"
 
-#include "opencl/source/helpers/cl_hw_helper.h"
+#include "opencl/source/helpers/cl_gfx_core_helper.h"
 #include "opencl/source/helpers/cl_memory_properties_helpers.h"
 #include "opencl/source/mem_obj/image.h"
 #include "opencl/test/unit_test/mem_obj/image_compression_fixture.h"