diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12b30ed20c..7baa554a6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -840,6 +840,7 @@ configure_file(config.h.in ${NEO_BUILD_DIR}/config.h)
 configure_file(driver_version.h.in ${NEO_BUILD_DIR}/driver_version.h) # Put Driver version into define
 configure_file(lib_names.h.in ${NEO_BUILD_DIR}/lib_names.h)
 configure_file(test_files_setup.h.in ${NEO_BUILD_DIR}/test_files_setup.h)
+configure_file(hw_cmds_default.h.in ${NEO_BUILD_DIR}/hw_cmds_default.h)
 
 if(BUILD_WITH_L0)
   add_subdirectory_unique(level_zero)
diff --git a/cmake/setup_platform_flags.cmake b/cmake/setup_platform_flags.cmake
index a1919798c6..4e6b377b77 100644
--- a/cmake/setup_platform_flags.cmake
+++ b/cmake/setup_platform_flags.cmake
@@ -237,7 +237,6 @@ if(SUPPORT_GEN12LP)
 endif()
 
 if(SUPPORT_XE_HP_CORE)
-  SET_FLAGS_FOR("XE_HP_CORE")
   set(CORE_XE_HP_CORE_REVISIONS 4)
   if(TESTS_XE_HP_CORE)
     if(TESTS_XE_HP_SDV)
diff --git a/hw_cmds_default.h.in b/hw_cmds_default.h.in
new file mode 100644
index 0000000000..7789bc7090
--- /dev/null
+++ b/hw_cmds_default.h.in
@@ -0,0 +1,10 @@
+/*
+ * Copyright (C) 2018-2022 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ */
+
+#pragma once
+
+#include "shared/source/${MAP_${DEFAULT_SUPPORTED_PLATFORM}_CORE_lower}/hw_cmds_${MAP_${DEFAULT_SUPPORTED_PLATFORM}_lower}.h"
diff --git a/level_zero/core/test/unit_tests/main.cpp b/level_zero/core/test/unit_tests/main.cpp
index 2174ca06a0..ca75a446c1 100644
--- a/level_zero/core/test/unit_tests/main.cpp
+++ b/level_zero/core/test/unit_tests/main.cpp
@@ -28,7 +28,7 @@
 #include "level_zero/core/source/compiler_interface/l0_reg_path.h"
 
 #include "gmock/gmock.h"
-#include "hw_cmds.h"
+#include "hw_cmds_default.h"
 #include "igfxfmid.h"
 
 #include <fstream>
diff --git a/opencl/test/unit_test/main.cpp b/opencl/test/unit_test/main.cpp
index be34436f7e..2622268bb0 100644
--- a/opencl/test/unit_test/main.cpp
+++ b/opencl/test/unit_test/main.cpp
@@ -32,7 +32,7 @@
 #include "opencl/test/unit_test/ult_config_listener.h"
 
 #include "gmock/gmock.h"
-#include "hw_cmds.h"
+#include "hw_cmds_default.h"
 #include "test_files_setup.h"
 
 #include <algorithm>
diff --git a/opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp b/opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp
index 1e8e99bd13..ba22eb1e9c 100644
--- a/opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp
+++ b/opencl/test/unit_test/offline_compiler/ocloc_api_tests.cpp
@@ -20,7 +20,7 @@
 
 #include "environment.h"
 #include "gtest/gtest.h"
-#include "hw_cmds.h"
+#include "hw_cmds_default.h"
 
 #include <algorithm>
 #include <array>
diff --git a/platforms.cmake b/platforms.cmake
index 35b6ff146f..0990befbf1 100644
--- a/platforms.cmake
+++ b/platforms.cmake
@@ -154,6 +154,10 @@ macro(SET_FLAGS_FOR CORE_TYPE)
         set(TESTS_${CORE_TYPE} TRUE CACHE BOOL "Build ULTs for ${CORE_TYPE} devices" FORCE)
       endif()
     endif()
+    string(TOLOWER ${CORE_TYPE} MAP_${SKU_NAME}_CORE_lower)
+    string(TOLOWER ${SKU_NAME} MAP_${SKU_NAME}_lower)
+    set(MAP_${SKU_NAME}_CORE_lower "${CORE_PREFIX}${MAP_${SKU_NAME}_CORE_lower}" CACHE STRING "Core name for SKU" FORCE)
+    set(MAP_${SKU_NAME}_lower ${MAP_${SKU_NAME}_lower} CACHE STRING "SKU in lower case" FORCE)
   endforeach()
 
   set(SUPPORT_${CORE_TYPE} ${SUPPORT_GEN_DEFAULT} CACHE BOOL "Support ${CORE_TYPE} devices")
diff --git a/shared/source/dll/get_devices.cpp b/shared/source/dll/get_devices.cpp
index 335723f867..9c6e836762 100644
--- a/shared/source/dll/get_devices.cpp
+++ b/shared/source/dll/get_devices.cpp
@@ -9,7 +9,7 @@
 #include "shared/source/execution_environment/execution_environment.h"
 #include "shared/source/execution_environment/root_device_environment.h"
 
-#include "hw_cmds.h"
+#include "hw_cmds_default.h"
 
 namespace NEO {
 
diff --git a/shared/source/xe_hp_core/hw_cmds.h b/shared/source/xe_hp_core/hw_cmds.h
index 9566332823..2b6ab1f679 100644
--- a/shared/source/xe_hp_core/hw_cmds.h
+++ b/shared/source/xe_hp_core/hw_cmds.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2021 Intel Corporation
+ * Copyright (C) 2021-2022 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -7,5 +7,5 @@
 
 #pragma once
 #ifdef SUPPORT_XE_HP_SDV
-#include "hw_cmds_xehp.h"
+#include "hw_cmds_xe_hp_sdv.h"
 #endif
diff --git a/shared/source/xe_hp_core/hw_cmds_xehp.h b/shared/source/xe_hp_core/hw_cmds_xe_hp_sdv.h
similarity index 100%
rename from shared/source/xe_hp_core/hw_cmds_xehp.h
rename to shared/source/xe_hp_core/hw_cmds_xe_hp_sdv.h
diff --git a/shared/test/common/os_interface/linux/drm_memory_manager_fixture.cpp b/shared/test/common/os_interface/linux/drm_memory_manager_fixture.cpp
index 7f0a2bfa88..3feabc5579 100644
--- a/shared/test/common/os_interface/linux/drm_memory_manager_fixture.cpp
+++ b/shared/test/common/os_interface/linux/drm_memory_manager_fixture.cpp
@@ -13,7 +13,7 @@
 #include "shared/test/common/mocks/mock_builtins.h"
 #include "shared/test/common/mocks/mock_device.h"
 
-#include "hw_cmds.h"
+#include "hw_cmds_default.h"
 
 namespace NEO {
 
diff --git a/shared/test/unit_test/main.cpp b/shared/test/unit_test/main.cpp
index 02fc2a70b7..215edfafa3 100644
--- a/shared/test/unit_test/main.cpp
+++ b/shared/test/unit_test/main.cpp
@@ -29,7 +29,7 @@
 #include "shared/test/unit_test/tests_configuration.h"
 
 #include "gmock/gmock.h"
-#include "hw_cmds.h"
+#include "hw_cmds_default.h"
 #include "test_files_setup.h"
 
 #include <algorithm>