diff --git a/shared/test/unit_test/xe_hpc_core/pvc/linux/CMakeLists.txt b/shared/test/unit_test/xe_hpc_core/pvc/linux/CMakeLists.txt
index b5d30df11f..6d1730e4e0 100644
--- a/shared/test/unit_test/xe_hpc_core/pvc/linux/CMakeLists.txt
+++ b/shared/test/unit_test/xe_hpc_core/pvc/linux/CMakeLists.txt
@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2022 Intel Corporation
+# Copyright (C) 2022-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(UNIX)
   target_sources(neo_shared_tests PRIVATE
-                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_pvc.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/product_helper_tests_pvc.cpp
   )
   add_subdirectories()
 endif()
diff --git a/shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/linux/product_helper_tests_pvc.cpp
similarity index 100%
rename from shared/test/unit_test/xe_hpc_core/pvc/linux/hw_info_config_tests_pvc.cpp
rename to shared/test/unit_test/xe_hpc_core/pvc/linux/product_helper_tests_pvc.cpp
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/linux/CMakeLists.txt b/shared/test/unit_test/xe_hpg_core/dg2/linux/CMakeLists.txt
index 4110b7e25b..bb1dc9d813 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/linux/CMakeLists.txt
+++ b/shared/test/unit_test/xe_hpg_core/dg2/linux/CMakeLists.txt
@@ -1,12 +1,12 @@
 #
-# Copyright (C) 2022 Intel Corporation
+# Copyright (C) 2022-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(UNIX)
   target_sources(neo_shared_tests PRIVATE
-                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_dg2.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/product_helper_tests_dg2.cpp
   )
   add_subdirectories()
 endif()
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/linux/product_helper_tests_dg2.cpp
similarity index 100%
rename from shared/test/unit_test/xe_hpg_core/dg2/linux/hw_info_config_tests_dg2.cpp
rename to shared/test/unit_test/xe_hpg_core/dg2/linux/product_helper_tests_dg2.cpp
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/windows/CMakeLists.txt b/shared/test/unit_test/xe_hpg_core/dg2/windows/CMakeLists.txt
index 655da3d18e..920840c2eb 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/windows/CMakeLists.txt
+++ b/shared/test/unit_test/xe_hpg_core/dg2/windows/CMakeLists.txt
@@ -7,9 +7,9 @@
 if(WIN32)
   target_sources(neo_shared_tests PRIVATE
                  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_dg2.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/product_helper_tests_dg2.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/wddm_memory_manager_tests_dg2.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}hw_info_config_tests_extra_dg2.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/${BRANCH_DIR_SUFFIX}product_helper_tests_extra_dg2.cpp
   )
   add_subdirectories()
 endif()
\ No newline at end of file
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/windows/product_helper_tests_dg2.cpp
similarity index 100%
rename from shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_dg2.cpp
rename to shared/test/unit_test/xe_hpg_core/dg2/windows/product_helper_tests_dg2.cpp
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_extra_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/windows/product_helper_tests_extra_dg2.cpp
similarity index 100%
rename from shared/test/unit_test/xe_hpg_core/dg2/windows/hw_info_config_tests_extra_dg2.cpp
rename to shared/test/unit_test/xe_hpg_core/dg2/windows/product_helper_tests_extra_dg2.cpp
diff --git a/shared/test/unit_test/xe_hpg_core/mtl/CMakeLists.txt b/shared/test/unit_test/xe_hpg_core/mtl/CMakeLists.txt
index 735ee52c53..38357e579e 100644
--- a/shared/test/unit_test/xe_hpg_core/mtl/CMakeLists.txt
+++ b/shared/test/unit_test/xe_hpg_core/mtl/CMakeLists.txt
@@ -15,7 +15,7 @@ if(TESTS_MTL)
                  ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core_mtl.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/hw_aot_config_tests_mtl.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/gfx_core_helper_tests_mtl.cpp
-                 ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_mtl.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/product_helper_tests_mtl.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_tests_mtl.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests_mtl.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/sampler_tests_mtl.cpp
diff --git a/shared/test/unit_test/xe_hpg_core/mtl/linux/CMakeLists.txt b/shared/test/unit_test/xe_hpg_core/mtl/linux/CMakeLists.txt
index ec482c7c80..01d4f76801 100644
--- a/shared/test/unit_test/xe_hpg_core/mtl/linux/CMakeLists.txt
+++ b/shared/test/unit_test/xe_hpg_core/mtl/linux/CMakeLists.txt
@@ -1,9 +1,9 @@
 #
-# Copyright (C) 2022 Intel Corporation
+# Copyright (C) 2022-2023 Intel Corporation
 #
 # SPDX-License-Identifier: MIT
 #
 
 if(UNIX)
-  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_mtl.cpp)
+  target_sources(neo_shared_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/product_helper_tests_mtl.cpp)
 endif()
diff --git a/shared/test/unit_test/xe_hpg_core/mtl/linux/hw_info_config_tests_mtl.cpp b/shared/test/unit_test/xe_hpg_core/mtl/linux/product_helper_tests_mtl.cpp
similarity index 100%
rename from shared/test/unit_test/xe_hpg_core/mtl/linux/hw_info_config_tests_mtl.cpp
rename to shared/test/unit_test/xe_hpg_core/mtl/linux/product_helper_tests_mtl.cpp
diff --git a/shared/test/unit_test/xe_hpg_core/mtl/hw_info_config_tests_mtl.cpp b/shared/test/unit_test/xe_hpg_core/mtl/product_helper_tests_mtl.cpp
similarity index 100%
rename from shared/test/unit_test/xe_hpg_core/mtl/hw_info_config_tests_mtl.cpp
rename to shared/test/unit_test/xe_hpg_core/mtl/product_helper_tests_mtl.cpp