diff --git a/shared/test/unit_test/xe_hpc_core/CMakeLists.txt b/shared/test/unit_test/xe_hpc_core/CMakeLists.txt
index 294eda4f35..f9185a0be9 100644
--- a/shared/test/unit_test/xe_hpc_core/CMakeLists.txt
+++ b/shared/test/unit_test/xe_hpc_core/CMakeLists.txt
@@ -14,7 +14,6 @@ if(TESTS_XE_HPC_CORE)
       ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_xe_hpc_core_tests.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_xe_hpc_core_tests.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/image_surface_state_tests_xe_hpc_core.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/product_config_tests_xe_hpc_core.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/simd_helper_tests_xe_hpc_core.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_xe_hpc_core.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_preamble_xe_hpc_core.cpp
diff --git a/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt b/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt
index b5dad7eacf..937db3ee26 100644
--- a/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt
+++ b/shared/test/unit_test/xe_hpc_core/pvc/CMakeLists.txt
@@ -10,6 +10,7 @@ if(TESTS_PVC)
       ${CMAKE_CURRENT_SOURCE_DIR}/device_binary_format_ar_tests_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/dispatch_walker_tests_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_tests_pvc.cpp
+      ${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/product_config_tests_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_dispatch_kernel_pvc.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_info_config_pvc.cpp
diff --git a/shared/test/unit_test/xe_hpc_core/product_config_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/pvc/product_config_helper_tests_pvc.cpp
similarity index 74%
rename from shared/test/unit_test/xe_hpc_core/product_config_tests_xe_hpc_core.cpp
rename to shared/test/unit_test/xe_hpc_core/pvc/product_config_helper_tests_pvc.cpp
index 963a59b99c..94bcb3c896 100644
--- a/shared/test/unit_test/xe_hpc_core/product_config_tests_xe_hpc_core.cpp
+++ b/shared/test/unit_test/xe_hpc_core/pvc/product_config_helper_tests_pvc.cpp
@@ -11,9 +11,9 @@
 #include "platforms.h"
 
 using namespace NEO;
-using ProductConfigHelperXeHpgCoreTests = ::testing::Test;
+using ProductConfigHelperPvcTests = ::testing::Test;
 
-XE_HPC_CORETEST_F(ProductConfigHelperXeHpgCoreTests, givenVariousVariantsOfXeHpcAcronymsWhenGetReleaseThenCorrectValueIsReturned) {
+PVCTEST_F(ProductConfigHelperPvcTests, givenVariousVariantsOfXeHpcAcronymsWhenGetReleaseThenCorrectValueIsReturned) {
     std::vector<std::string> acronymsVariants = {"xe_hpc_core", "xe_hpc", "xehpc", "XeHpc"};
     for (auto &acronym : acronymsVariants) {
         ProductConfigHelper::adjustDeviceName(acronym);
diff --git a/shared/test/unit_test/xe_hpg_core/CMakeLists.txt b/shared/test/unit_test/xe_hpg_core/CMakeLists.txt
index c7639c63a2..770cf428f1 100644
--- a/shared/test/unit_test/xe_hpg_core/CMakeLists.txt
+++ b/shared/test/unit_test/xe_hpg_core/CMakeLists.txt
@@ -11,7 +11,6 @@ if(TESTS_XE_HPG_CORE)
       ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/hw_cmds_xe_hpg_core_tests.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_xe_hpg_core.cpp
-      ${CMAKE_CURRENT_SOURCE_DIR}/product_config_tests_xe_hpg_core.cpp
       ${CMAKE_CURRENT_SOURCE_DIR}/test_encode_dispatch_kernel_xe_hpg_core.cpp
   )
 
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt b/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt
index 7934aea657..f87ec44a47 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt
+++ b/shared/test/unit_test/xe_hpg_core/dg2/CMakeLists.txt
@@ -13,6 +13,7 @@ if(TESTS_DG2)
                  ${CMAKE_CURRENT_SOURCE_DIR}/excludes_xe_hpg_core_dg2.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/hw_helper_tests_dg2.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}/hw_info_config_tests_dg2.cpp
+                 ${CMAKE_CURRENT_SOURCE_DIR}/product_config_helper_tests_dg2.cpp
                  ${CMAKE_CURRENT_SOURCE_DIR}${BRANCH_DIR_SUFFIX}product_config_tests_dg2.cpp
   )
   add_subdirectories()
diff --git a/shared/test/unit_test/xe_hpg_core/product_config_tests_xe_hpg_core.cpp b/shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp
similarity index 75%
rename from shared/test/unit_test/xe_hpg_core/product_config_tests_xe_hpg_core.cpp
rename to shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp
index 7f88dfaba0..dc59ea71bd 100644
--- a/shared/test/unit_test/xe_hpg_core/product_config_tests_xe_hpg_core.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/product_config_helper_tests_dg2.cpp
@@ -11,9 +11,9 @@
 #include "platforms.h"
 
 using namespace NEO;
-using ProductConfigHelperXeHpgCoreTests = ::testing::Test;
+using ProductConfigHelperDg2Tests = ::testing::Test;
 
-XE_HPG_CORETEST_F(ProductConfigHelperXeHpgCoreTests, givenVariousVariantsOfAcronymsWhenGetReleaseThenCorrectValueIsReturned) {
+DG2TEST_F(ProductConfigHelperDg2Tests, givenVariousVariantsOfXeHpgAcronymsWhenGetReleaseThenCorrectValueIsReturned) {
     std::vector<std::string> acronymsVariants = {"xe_hpg_core", "xe_hpg", "xehpg", "XeHpg"};
     for (auto &acronym : acronymsVariants) {
         ProductConfigHelper::adjustDeviceName(acronym);
diff --git a/third_party/aot_config_headers/platforms.h b/third_party/aot_config_headers/platforms.h
index c8cbb0be4c..a36a0bb311 100644
--- a/third_party/aot_config_headers/platforms.h
+++ b/third_party/aot_config_headers/platforms.h
@@ -124,9 +124,12 @@ static const std::map<std::string, AOT::PRODUCT_CONFIG> productConfigAcronyms =
 #endif
 #ifdef SUPPORT_KBL
     {"kbl", KBL},
+    {"aml", AML},
 #endif
 #ifdef SUPPORT_CFL
     {"cfl", CFL},
+    {"cml", CML},
+    {"whl", WHL},
 #endif
 #ifdef SUPPORT_BXT
     {"apl", APL},
@@ -135,15 +138,6 @@ static const std::map<std::string, AOT::PRODUCT_CONFIG> productConfigAcronyms =
 #ifdef SUPPORT_GLK
     {"glk", GLK},
 #endif
-#ifdef SUPPORT_WHL
-    {"whl", WHL},
-#endif
-#ifdef SUPPORT_AML
-    {"aml", AML},
-#endif
-#ifdef SUPPORT_CML
-    {"cml", CML},
-#endif
 #ifdef SUPPORT_ICLLP
     {"icllp", ICL},
 #endif
@@ -160,10 +154,8 @@ static const std::map<std::string, AOT::PRODUCT_CONFIG> productConfigAcronyms =
 #ifdef SUPPORT_RKL
     {"rkl", RKL},
 #endif
-#ifdef SUPPORT_RPLS
-    {"rpl-s", RPL_S},
-#endif
 #ifdef SUPPORT_ADLS
+    {"rpl-s", RPL_S},
     {"adl-s", ADL_S},
 #endif
 #ifdef SUPPORT_ADLP