diff --git a/cmake/setup_platform_flags.cmake b/cmake/setup_platform_flags.cmake
index 30a33e6267..16df5f5a31 100644
--- a/cmake/setup_platform_flags.cmake
+++ b/cmake/setup_platform_flags.cmake
@@ -195,15 +195,15 @@ if(SUPPORT_XE_HP_CORE)
   if(TESTS_XE_HP_CORE)
     ADD_ITEM_FOR_GEN("FAMILY_NAME" "TESTED" "XE_HP_CORE" "XeHpFamily")
   endif()
-  if(SUPPORT_XEHP)
-    ADD_PRODUCT("SUPPORTED" "XEHP" "IGFX_XE_HP_SDV")
-    ADD_PLATFORM_FOR_GEN("SUPPORTED" "XE_HP_CORE" "XEHP" "CORE")
-    ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "XE_HP_CORE" "XEHP" "CORE")
-    set(PREFERRED_PLATFORM "XEHP")
-    if(TESTS_XEHP)
+  if(SUPPORT_XE_HP_SDV)
+    ADD_PRODUCT("SUPPORTED" "XE_HP_SDV" "IGFX_XE_HP_SDV")
+    ADD_PLATFORM_FOR_GEN("SUPPORTED" "XE_HP_CORE" "XE_HP_SDV" "CORE")
+    ADD_PLATFORM_FOR_GEN("SUPPORTED_IMAGES" "XE_HP_CORE" "XE_HP_SDV" "CORE")
+    set(PREFERRED_PLATFORM "XE_HP_SDV")
+    if(TESTS_XE_HP_SDV)
       set(PREFERRED_FAMILY_NAME "XeHpFamily")
-      ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "XE_HP_CORE" "XEHP")
-      ADD_PRODUCT("TESTED" "XEHP" "IGFX_XE_HP_SDV")
+      ADD_ITEM_FOR_GEN("PLATFORMS" "TESTED" "XE_HP_CORE" "XE_HP_SDV")
+      ADD_PRODUCT("TESTED" "XE_HP_SDV" "IGFX_XE_HP_SDV")
     endif()
   endif()
 endif()
diff --git a/level_zero/core/source/xe_hp_core/xehp/CMakeLists.txt b/level_zero/core/source/xe_hp_core/xehp/CMakeLists.txt
index 48bd93378b..802976a70a 100644
--- a/level_zero/core/source/xe_hp_core/xehp/CMakeLists.txt
+++ b/level_zero/core/source/xe_hp_core/xehp/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-if(SUPPORT_XEHP)
+if(SUPPORT_XE_HP_SDV)
   set(HW_SOURCES_XE_HP_CORE
       ${HW_SOURCES_XE_HP_CORE}
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
diff --git a/manifests/manifest.yml b/manifests/manifest.yml
index 7cadd0307d..ef20f4c548 100644
--- a/manifests/manifest.yml
+++ b/manifests/manifest.yml
@@ -20,7 +20,7 @@ components:
   infra:
     branch: infra
     dest_dir: infra
-    revision: be6a7e0f7eef3267e51ffa960d9976b0fa70cc04
+    revision: 180b0b5df7178c5bf9944b1b8293c684c65ddf17
     type: git
   internal:
     branch: master
diff --git a/opencl/source/dll/get_devices.cpp b/opencl/source/dll/get_devices.cpp
index 6109e0667d..e478c5c483 100644
--- a/opencl/source/dll/get_devices.cpp
+++ b/opencl/source/dll/get_devices.cpp
@@ -32,7 +32,7 @@ bool prepareDeviceEnvironments(ExecutionEnvironment &executionEnvironment) {
             }
 
             if (is32bit) {
-#ifdef SUPPORT_XEHP
+#ifdef SUPPORT_XE_HP_SDV
                 if (executionEnvironment.rootDeviceEnvironments[i]->getHardwareInfo()->platform.eProductFamily == IGFX_XE_HP_SDV) {
                     unsupportedDeviceDetected = true;
                 }
diff --git a/opencl/source/xe_hp_core/definitions/hw_info_config_xehp.inl b/opencl/source/xe_hp_core/definitions/hw_info_config_xehp.inl
index 362eda0372..0c64463623 100644
--- a/opencl/source/xe_hp_core/definitions/hw_info_config_xehp.inl
+++ b/opencl/source/xe_hp_core/definitions/hw_info_config_xehp.inl
@@ -5,16 +5,16 @@
  *
  */
 
-const HardwareInfo XEHP::hwInfo = XEHP_CONFIG::hwInfo;
-const uint64_t XEHP::defaultHardwareInfoConfig = 0;
+const HardwareInfo XE_HP_SDV::hwInfo = XE_HP_SDV_CONFIG::hwInfo;
+const uint64_t XE_HP_SDV::defaultHardwareInfoConfig = 0;
 
 void setupXEHPHardwareInfoImpl(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig) {
     if (hwInfoConfig == 0x0) {
         // Default config
-        XEHP_CONFIG::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
+        XE_HP_SDV_CONFIG::setupHardwareInfo(hwInfo, setupFeatureTableAndWorkaroundTable);
     } else {
         UNRECOVERABLE_IF(true);
     }
 }
 
-void (*XEHP::setupHardwareInfo)(HardwareInfo *, bool, const uint64_t) = setupXEHPHardwareInfoImpl;
+void (*XE_HP_SDV::setupHardwareInfo)(HardwareInfo *, bool, const uint64_t) = setupXEHPHardwareInfoImpl;
diff --git a/opencl/source/xe_hp_core/hw_info_xe_hp_core.cpp b/opencl/source/xe_hp_core/hw_info_xe_hp_core.cpp
index a85aeb84d9..f034250fc2 100644
--- a/opencl/source/xe_hp_core/hw_info_xe_hp_core.cpp
+++ b/opencl/source/xe_hp_core/hw_info_xe_hp_core.cpp
@@ -5,7 +5,7 @@
  *
  */
 
-#ifdef SUPPORT_XEHP
+#ifdef SUPPORT_XE_HP_SDV
 #include "hw_info_xehp.inl"
 #endif
 
diff --git a/opencl/source/xe_hp_core/hw_info_xehp.inl b/opencl/source/xe_hp_core/hw_info_xehp.inl
index 82d409b547..5df2441c9e 100644
--- a/opencl/source/xe_hp_core/hw_info_xehp.inl
+++ b/opencl/source/xe_hp_core/hw_info_xehp.inl
@@ -15,13 +15,13 @@
 
 namespace NEO {
 
-const char *HwMapper<IGFX_XE_HP_SDV>::abbreviation = "xehp";
+const char *HwMapper<IGFX_XE_HP_SDV>::abbreviation = "xe_hp_sdv";
 
 bool isSimulationXEHP(unsigned short deviceId) {
     return false;
 };
 
-const PLATFORM XEHP::platform = {
+const PLATFORM XE_HP_SDV::platform = {
     IGFX_XE_HP_SDV,
     PCH_UNKNOWN,
     IGFX_XE_HP_CORE,
@@ -33,7 +33,7 @@ const PLATFORM XEHP::platform = {
     0,             // usRevId_PCH
     GTTYPE_UNDEFINED};
 
-const RuntimeCapabilityTable XEHP::capabilityTable{
+const RuntimeCapabilityTable XE_HP_SDV::capabilityTable{
     EngineDirectSubmissionInitVec{
         {aub_stream::ENGINE_RCS, {true, true, false, true}},
         {aub_stream::ENGINE_CCS, {true, true, false, true}}}, // directSubmissionEngines
@@ -49,7 +49,7 @@ const RuntimeCapabilityTable XEHP::capabilityTable{
     CmdServicesMemTraceVersion::DeviceValues::XeHP_SDV,       // aubDeviceId
     0,                                                        // extraQuantityThreadsPerEU
     64,                                                       // slmSize
-    sizeof(XEHP::GRF),                                        // grfSize
+    sizeof(XE_HP_SDV::GRF),                                   // grfSize
     36u,                                                      // timestampValidBits
     32u,                                                      // kernelTimestampValidBits
     false,                                                    // blitterOperationsSupported
@@ -83,10 +83,10 @@ const RuntimeCapabilityTable XEHP::capabilityTable{
     true                                                      // fusedEuEnabled
 };
 
-WorkaroundTable XEHP::workaroundTable = {};
-FeatureTable XEHP::featureTable = {};
+WorkaroundTable XE_HP_SDV::workaroundTable = {};
+FeatureTable XE_HP_SDV::featureTable = {};
 
-void XEHP::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
+void XE_HP_SDV::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
     FeatureTable *featureTable = &hwInfo->featureTable;
     WorkaroundTable *workaroundTable = &hwInfo->workaroundTable;
 
@@ -124,19 +124,19 @@ void XEHP::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
     workaroundTable->waEnablePreemptionGranularityControlByUMD = true;
 };
 
-const HardwareInfo XEHP_CONFIG::hwInfo = {
-    &XEHP::platform,
-    &XEHP::featureTable,
-    &XEHP::workaroundTable,
-    &XEHP_CONFIG::gtSystemInfo,
-    XEHP::capabilityTable,
+const HardwareInfo XE_HP_SDV_CONFIG::hwInfo = {
+    &XE_HP_SDV::platform,
+    &XE_HP_SDV::featureTable,
+    &XE_HP_SDV::workaroundTable,
+    &XE_HP_SDV_CONFIG::gtSystemInfo,
+    XE_HP_SDV::capabilityTable,
 };
-GT_SYSTEM_INFO XEHP_CONFIG::gtSystemInfo = {0};
-void XEHP_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
-    XEHP_CONFIG::setupHardwareInfoMultiTile(hwInfo, setupFeatureTableAndWorkaroundTable, false);
+GT_SYSTEM_INFO XE_HP_SDV_CONFIG::gtSystemInfo = {0};
+void XE_HP_SDV_CONFIG::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable) {
+    XE_HP_SDV_CONFIG::setupHardwareInfoMultiTile(hwInfo, setupFeatureTableAndWorkaroundTable, false);
 }
 
-void XEHP_CONFIG::setupHardwareInfoMultiTile(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, bool setupMultiTile) {
+void XE_HP_SDV_CONFIG::setupHardwareInfoMultiTile(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, bool setupMultiTile) {
     GT_SYSTEM_INFO *gtSysInfo = &hwInfo->gtSystemInfo;
     gtSysInfo->CsrSizeInMb = 8;
     gtSysInfo->IsL3HashModeEnabled = false;
@@ -153,7 +153,7 @@ void XEHP_CONFIG::setupHardwareInfoMultiTile(HardwareInfo *hwInfo, bool setupFea
     }
 
     if (setupFeatureTableAndWorkaroundTable) {
-        XEHP::setupFeatureAndWorkaroundTable(hwInfo);
+        XE_HP_SDV::setupFeatureAndWorkaroundTable(hwInfo);
     }
 };
 #include "hw_info_config_xehp.inl"
diff --git a/opencl/test/unit_test/windows/get_devices_tests.cpp b/opencl/test/unit_test/windows/get_devices_tests.cpp
index a66bdcd3a1..070c3b47b3 100644
--- a/opencl/test/unit_test/windows/get_devices_tests.cpp
+++ b/opencl/test/unit_test/windows/get_devices_tests.cpp
@@ -53,7 +53,7 @@ HWTEST_F(PrepareDeviceEnvironmentsTests, Given32bitApplicationWhenPrepareDeviceE
 
     switch (::productFamily) {
     case IGFX_UNKNOWN:
-#ifdef SUPPORT_XEHP
+#ifdef SUPPORT_XE_HP_SDV
     case IGFX_XE_HP_SDV:
 #endif
         EXPECT_FALSE(returnValue);
diff --git a/opencl/test/unit_test/xe_hp_core/xehp/CMakeLists.txt b/opencl/test/unit_test/xe_hp_core/xehp/CMakeLists.txt
index 8284dbf040..69240fbdb9 100644
--- a/opencl/test/unit_test/xe_hp_core/xehp/CMakeLists.txt
+++ b/opencl/test/unit_test/xe_hp_core/xehp/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-if(TESTS_XEHP)
+if(TESTS_XE_HP_SDV)
   set(IGDRCL_SRCS_tests_xe_hp_core_xehp
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/cache_flush_tests_xehp.inl
@@ -26,6 +26,6 @@ if(TESTS_XEHP)
 
   target_sources(igdrcl_tests PRIVATE ${IGDRCL_SRCS_tests_xe_hp_core_xehp})
   add_subdirectories()
-  neo_copy_test_files_with_revision(copy_test_files_xehp_0 xehp 0)
-  add_dependencies(copy_test_files_per_product copy_test_files_xehp_0)
+  neo_copy_test_files_with_revision(copy_test_files_xe_hp_sdv_0 xe_hp_sdv 0)
+  add_dependencies(copy_test_files_per_product copy_test_files_xe_hp_sdv_0)
 endif()
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 cfead18784..0712d4c0c2 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
@@ -35,7 +35,7 @@ XEHPTEST_F(XeHPHwInfoTest, whenSetupHardwareInfoWithSetupFeatureTableFlagTrueOrF
     EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated);
     EXPECT_EQ(8u, gtSystemInfo.CsrSizeInMb);
 
-    XEHP_CONFIG::setupHardwareInfo(&hwInfo, false);
+    XE_HP_SDV_CONFIG::setupHardwareInfo(&hwInfo, false);
     EXPECT_FALSE(featureTable.ftrLocalMemory);
     EXPECT_FALSE(featureTable.ftrFlatPhysCCS);
     EXPECT_FALSE(featureTable.ftrLinearCCS);
@@ -50,7 +50,7 @@ XEHPTEST_F(XeHPHwInfoTest, whenSetupHardwareInfoWithSetupFeatureTableFlagTrueOrF
     EXPECT_FALSE(gtSystemInfo.IsDynamicallyPopulated);
     EXPECT_EQ(8u, gtSystemInfo.CsrSizeInMb);
 
-    XEHP_CONFIG::setupHardwareInfo(&hwInfo, true);
+    XE_HP_SDV_CONFIG::setupHardwareInfo(&hwInfo, true);
     EXPECT_TRUE(featureTable.ftrLocalMemory);
     EXPECT_TRUE(featureTable.ftrFlatPhysCCS);
     EXPECT_TRUE(featureTable.ftrLinearCCS);
@@ -71,13 +71,13 @@ XEHPTEST_F(XeHPHwInfoTest, givenAlreadyInitializedHwInfoWhenSetupCalledThenDontO
 
     hwInfo.gtSystemInfo.SliceCount = 0;
 
-    XEHP_CONFIG::setupHardwareInfo(&hwInfo, false);
+    XE_HP_SDV_CONFIG::setupHardwareInfo(&hwInfo, false);
 
     EXPECT_NE(0u, hwInfo.gtSystemInfo.SliceCount);
 
     auto expectedValue = ++hwInfo.gtSystemInfo.SliceCount;
 
-    XEHP_CONFIG::setupHardwareInfo(&hwInfo, false);
+    XE_HP_SDV_CONFIG::setupHardwareInfo(&hwInfo, false);
 
     EXPECT_EQ(expectedValue, hwInfo.gtSystemInfo.SliceCount);
 }
\ No newline at end of file
diff --git a/shared/source/xe_hp_core/enable_hw_info_config_xe_hp_core.cpp b/shared/source/xe_hp_core/enable_hw_info_config_xe_hp_core.cpp
index c208ce86ce..edce84aab5 100644
--- a/shared/source/xe_hp_core/enable_hw_info_config_xe_hp_core.cpp
+++ b/shared/source/xe_hp_core/enable_hw_info_config_xe_hp_core.cpp
@@ -10,7 +10,7 @@
 
 namespace NEO {
 
-#ifdef SUPPORT_XEHP
+#ifdef SUPPORT_XE_HP_SDV
 static EnableProductHwInfoConfig<IGFX_XE_HP_SDV> enableXEHP;
 #endif
 } // namespace NEO
diff --git a/shared/source/xe_hp_core/enable_xe_hp_core.cpp b/shared/source/xe_hp_core/enable_xe_hp_core.cpp
index 56b6ef1345..acb9954de2 100644
--- a/shared/source/xe_hp_core/enable_xe_hp_core.cpp
+++ b/shared/source/xe_hp_core/enable_xe_hp_core.cpp
@@ -12,7 +12,7 @@
 
 namespace NEO {
 
-#ifdef SUPPORT_XEHP
+#ifdef SUPPORT_XE_HP_SDV
 static EnableGfxProductHw<IGFX_XE_HP_SDV> enableGfxProductHwXEHP;
 #endif
 } // namespace NEO
diff --git a/shared/source/xe_hp_core/hw_cmds.h b/shared/source/xe_hp_core/hw_cmds.h
index 493ba828d0..9566332823 100644
--- a/shared/source/xe_hp_core/hw_cmds.h
+++ b/shared/source/xe_hp_core/hw_cmds.h
@@ -6,6 +6,6 @@
  */
 
 #pragma once
-#ifdef SUPPORT_XEHP
+#ifdef SUPPORT_XE_HP_SDV
 #include "hw_cmds_xehp.h"
 #endif
diff --git a/shared/source/xe_hp_core/hw_cmds_xehp.h b/shared/source/xe_hp_core/hw_cmds_xehp.h
index ea3de1e6ba..2ab0ba9cc7 100644
--- a/shared/source/xe_hp_core/hw_cmds_xehp.h
+++ b/shared/source/xe_hp_core/hw_cmds_xehp.h
@@ -8,7 +8,7 @@
 #pragma once
 #include "shared/source/xe_hp_core/hw_cmds_base.h"
 namespace NEO {
-struct XEHP : public XeHpFamily {
+struct XE_HP_SDV : public XeHpFamily {
     static const PLATFORM platform;
     static const HardwareInfo hwInfo;
     static const uint64_t defaultHardwareInfoConfig;
@@ -24,7 +24,7 @@ struct XEHP : public XeHpFamily {
     static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
 };
 
-class XEHP_CONFIG : public XEHP {
+class XE_HP_SDV_CONFIG : public XE_HP_SDV {
   public:
     static void setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable);
     static void setupHardwareInfoMultiTile(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, bool setupMultiTile);
diff --git a/shared/source/xe_hp_core/hw_info.h b/shared/source/xe_hp_core/hw_info.h
index 74df4b951e..3fd0b868aa 100644
--- a/shared/source/xe_hp_core/hw_info.h
+++ b/shared/source/xe_hp_core/hw_info.h
@@ -6,6 +6,6 @@
  */
 
 #pragma once
-#ifdef SUPPORT_XEHP
+#ifdef SUPPORT_XE_HP_SDV
 #include "hw_info_xehp.h"
 #endif
diff --git a/shared/source/xe_hp_core/hw_info_xehp.h b/shared/source/xe_hp_core/hw_info_xehp.h
index 3bc8437b3e..f953a076fe 100644
--- a/shared/source/xe_hp_core/hw_info_xehp.h
+++ b/shared/source/xe_hp_core/hw_info_xehp.h
@@ -10,7 +10,7 @@
 
 namespace NEO {
 
-struct XEHP;
+struct XE_HP_SDV;
 
 template <>
 struct HwMapper<IGFX_XE_HP_SDV> {
@@ -18,6 +18,6 @@ struct HwMapper<IGFX_XE_HP_SDV> {
 
     static const char *abbreviation;
     typedef GfxFamilyMapper<static_cast<GFXCORE_FAMILY>(gfxFamily)>::GfxFamily GfxFamily;
-    typedef XEHP GfxProduct;
+    typedef XE_HP_SDV GfxProduct;
 };
 } // namespace NEO
diff --git a/shared/source/xe_hp_core/linux/hw_info_config_xe_hp_core.cpp b/shared/source/xe_hp_core/linux/hw_info_config_xe_hp_core.cpp
index 65965f5a72..709c448c94 100644
--- a/shared/source/xe_hp_core/linux/hw_info_config_xe_hp_core.cpp
+++ b/shared/source/xe_hp_core/linux/hw_info_config_xe_hp_core.cpp
@@ -8,6 +8,6 @@
 #include "shared/source/os_interface/hw_info_config.inl"
 #include "shared/source/os_interface/hw_info_config_xehp_plus.inl"
 
-#ifdef SUPPORT_XEHP
+#ifdef SUPPORT_XE_HP_SDV
 #include "hw_info_config_xehp.inl"
 #endif
diff --git a/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_core.cpp b/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_core.cpp
index 5eb54d919c..6c3371d271 100644
--- a/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_core.cpp
+++ b/shared/source/xe_hp_core/windows/hw_info_config_xe_hp_core.cpp
@@ -15,7 +15,7 @@
 
 namespace NEO {
 
-#ifdef SUPPORT_XEHP
+#ifdef SUPPORT_XE_HP_SDV
 #include "shared/source/xe_hp_core/os_agnostic_hw_info_config_xe_hp_core.inl"
 template <>
 int HwInfoConfigHw<IGFX_XE_HP_SDV>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) {
diff --git a/shared/test/common/test_macros/header/test.h b/shared/test/common/test_macros/header/test.h
index 51393d525b..87535a7908 100644
--- a/shared/test/common/test_macros/header/test.h
+++ b/shared/test/common/test_macros/header/test.h
@@ -926,7 +926,7 @@ extern GFXCORE_FAMILY renderCoreFamily;
                       IGFX_GEN12LP_CORE,          \
                       IGFX_ALDERLAKE_S)
 #endif
-#ifdef TESTS_XEHP
+#ifdef TESTS_XE_HP_SDV
 #define XEHPTEST_F(test_fixture, test_name)                          \
     FAMILYTEST_TEST_(test_fixture, test_name, test_fixture,          \
                      ::testing::internal::GetTypeId<test_fixture>(), \
diff --git a/shared/test/common/xe_hp_core/xehp/CMakeLists.txt b/shared/test/common/xe_hp_core/xehp/CMakeLists.txt
index f01ad23b02..a89b85a4fd 100644
--- a/shared/test/common/xe_hp_core/xehp/CMakeLists.txt
+++ b/shared/test/common/xe_hp_core/xehp/CMakeLists.txt
@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: MIT
 #
 
-if(TESTS_XEHP)
+if(TESTS_XE_HP_SDV)
   set(NEO_CORE_TESTS_XE_HP_CORE_XEHP
       ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
       ${CMAKE_CURRENT_SOURCE_DIR}/test_hw_helper_xehp.cpp