diff --git a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
index 91104be68f..0a319023c1 100644
--- a/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
+++ b/opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
@@ -816,11 +816,11 @@ TEST_F(Wddm20Tests, GivenMultipleHandlesWhenMakingResidentThenBytesToTrimIsCorre
 
 TEST_F(Wddm20Tests, WhenMakingNonResidentAndEvictNotNeededThenEvictIsCalledWithProperFlagSet) {
     DebugManagerStateRestore restorer{};
-    DebugManager.flags.PlaformSupportEvictWhenNecessaryFlag.set(1);
+    DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.set(1);
 
     auto productFamily = rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily;
     HwInfoConfig *hwConfig = HwInfoConfig::get(productFamily);
-    wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwConfig);
+    wddm->setPlatformSupportEvictIfNecessaryFlag(*hwConfig);
 
     D3DKMT_HANDLE handle = (D3DKMT_HANDLE)0x1234;
 
diff --git a/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp
index 2e19783b88..37a94c28d8 100644
--- a/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp
+++ b/opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp
@@ -499,11 +499,11 @@ TEST_F(WddmResidencyControllerTest, GivenListSizeLessThenDoubleCandidateCountWhe
 
 TEST_F(WddmResidencyControllerWithGdiTest, givenNotUsedAllocationsFromPreviousPeriodicTrimWhenTrimResidencyPeriodicTrimIsCalledThenAllocationsAreEvictedMarkedAndRemovedFromTrimCandidateList) {
     DebugManagerStateRestore restorer{};
-    DebugManager.flags.PlaformSupportEvictWhenNecessaryFlag.set(1);
+    DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.set(1);
 
     auto productFamily = rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily;
     HwInfoConfig *hwConfig = HwInfoConfig::get(productFamily);
-    wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwConfig);
+    wddm->setPlatformSupportEvictIfNecessaryFlag(*hwConfig);
 
     D3DKMT_TRIMNOTIFICATION trimNotification = {0};
     trimNotification.Flags.PeriodicTrim = 1;
@@ -584,11 +584,11 @@ TEST_F(WddmResidencyControllerWithGdiAndMemoryManagerTest, givenTripleAllocation
         GTEST_SKIP();
     }
     DebugManagerStateRestore restorer{};
-    DebugManager.flags.PlaformSupportEvictWhenNecessaryFlag.set(1);
+    DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.set(1);
 
     auto productFamily = executionEnvironment->rootDeviceEnvironments[0]->getHardwareInfo()->platform.eProductFamily;
     HwInfoConfig *hwConfig = HwInfoConfig::get(productFamily);
-    wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwConfig);
+    wddm->setPlatformSupportEvictIfNecessaryFlag(*hwConfig);
 
     D3DKMT_TRIMNOTIFICATION trimNotification = {0};
     trimNotification.Flags.PeriodicTrim = 1;
diff --git a/shared/source/debug_settings/debug_variables_base.inl b/shared/source/debug_settings/debug_variables_base.inl
index 4ce4cedc6e..ceb8b93f0c 100644
--- a/shared/source/debug_settings/debug_variables_base.inl
+++ b/shared/source/debug_settings/debug_variables_base.inl
@@ -214,7 +214,7 @@ DECLARE_DEBUG_VARIABLE(int32_t, ForceWddmLowPriorityContextValue, -1, "Force sch
 DECLARE_DEBUG_VARIABLE(int32_t, FailBuildProgramWithStatefulAccess, -1, "-1: default, 0: disable, 1: enable, Fail build program/module creation whenever stateful access is discovered (except built in kernels).")
 DECLARE_DEBUG_VARIABLE(int32_t, ForceImagesSupport, -1, "-1: default, 0: disable, 1: enable. Override support for Images.")
 DECLARE_DEBUG_VARIABLE(int32_t, OverrideL1CachePolicyInSurfaceStateAndStateless, -1, "-1: default, >=0 : following policy will be programmed in render surface state (for regular buffers) and stateless L1 caching")
-DECLARE_DEBUG_VARIABLE(int32_t, PlaformSupportEvictWhenNecessaryFlag, -1, "-1: default - platform specific, 0: disable, 1: enable")
+DECLARE_DEBUG_VARIABLE(int32_t, PlaformSupportEvictIfNecessaryFlag, -1, "-1: default - platform specific, 0: disable, 1: enable")
 DECLARE_DEBUG_VARIABLE(int32_t, ForceEvictOnlyIfNecessaryFlag, -1, "-1: default - driver selects when to use, 0: force never use this flag, 1: force always use this flag")
 
 /*LOGGING FLAGS*/
diff --git a/shared/source/os_interface/hw_info_config.h b/shared/source/os_interface/hw_info_config.h
index f8bc2bc0b4..4704b8826f 100644
--- a/shared/source/os_interface/hw_info_config.h
+++ b/shared/source/os_interface/hw_info_config.h
@@ -132,7 +132,7 @@ class HwInfoConfig {
     virtual bool isAdjustWalkOrderAvailable(const HardwareInfo &hwInfo) const = 0;
     virtual bool isAssignEngineRoundRobinSupported() const = 0;
     virtual uint32_t getL1CachePolicy() const = 0;
-    virtual bool isEvictionWhenNecessaryFlagSupported() const = 0;
+    virtual bool isEvictionIfNecessaryFlagSupported() const = 0;
     virtual void adjustNumberOfCcs(HardwareInfo &hwInfo) const = 0;
     virtual bool isPrefetcherDisablingInDirectSubmissionRequired() const = 0;
 
@@ -237,7 +237,7 @@ class HwInfoConfigHw : public HwInfoConfig {
     bool isAdjustWalkOrderAvailable(const HardwareInfo &hwInfo) const override;
     bool isAssignEngineRoundRobinSupported() const override;
     uint32_t getL1CachePolicy() const override;
-    bool isEvictionWhenNecessaryFlagSupported() const override;
+    bool isEvictionIfNecessaryFlagSupported() const override;
     void adjustNumberOfCcs(HardwareInfo &hwInfo) const override;
     bool isPrefetcherDisablingInDirectSubmissionRequired() const override;
 
diff --git a/shared/source/os_interface/hw_info_config_bdw_and_later.inl b/shared/source/os_interface/hw_info_config_bdw_and_later.inl
index 56f58f1a26..1a51a13bee 100644
--- a/shared/source/os_interface/hw_info_config_bdw_and_later.inl
+++ b/shared/source/os_interface/hw_info_config_bdw_and_later.inl
@@ -71,7 +71,7 @@ bool HwInfoConfigHw<gfxProduct>::isMatrixMultiplyAccumulateSupported(const Hardw
 }
 
 template <PRODUCT_FAMILY gfxProduct>
-bool HwInfoConfigHw<gfxProduct>::isEvictionWhenNecessaryFlagSupported() const {
+bool HwInfoConfigHw<gfxProduct>::isEvictionIfNecessaryFlagSupported() const {
     return true;
 }
 
diff --git a/shared/source/os_interface/hw_info_config_xehp_and_later.inl b/shared/source/os_interface/hw_info_config_xehp_and_later.inl
index f26aeef243..3852fba4fb 100644
--- a/shared/source/os_interface/hw_info_config_xehp_and_later.inl
+++ b/shared/source/os_interface/hw_info_config_xehp_and_later.inl
@@ -74,7 +74,7 @@ bool HwInfoConfigHw<gfxProduct>::isMatrixMultiplyAccumulateSupported(const Hardw
 }
 
 template <PRODUCT_FAMILY gfxProduct>
-bool HwInfoConfigHw<gfxProduct>::isEvictionWhenNecessaryFlagSupported() const {
+bool HwInfoConfigHw<gfxProduct>::isEvictionIfNecessaryFlagSupported() const {
     return true;
 }
 
diff --git a/shared/source/os_interface/windows/wddm/wddm.cpp b/shared/source/os_interface/windows/wddm/wddm.cpp
index df4f3bc323..bee1ee3bba 100644
--- a/shared/source/os_interface/windows/wddm/wddm.cpp
+++ b/shared/source/os_interface/windows/wddm/wddm.cpp
@@ -105,7 +105,7 @@ bool Wddm::init() {
     if (hwConfig->configureHwInfoWddm(hardwareInfo.get(), hardwareInfo.get(), nullptr)) {
         return false;
     }
-    setPlatformSupportEvictWhenNecessaryFlag(*hwConfig);
+    setPlatformSupportEvictIfNecessaryFlag(*hwConfig);
 
     auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*hardwareInfo);
     rootDeviceEnvironment.setHwInfo(hardwareInfo.get());
@@ -140,12 +140,12 @@ bool Wddm::init() {
     return configureDeviceAddressSpace();
 }
 
-void Wddm::setPlatformSupportEvictWhenNecessaryFlag(const HwInfoConfig &hwInfoConfig) {
-    platformSupportsEvictWhenNecessary = hwInfoConfig.isEvictionWhenNecessaryFlagSupported();
-    int32_t overridePlatformSupportsEvictWhenNecessary =
-        DebugManager.flags.PlaformSupportEvictWhenNecessaryFlag.get();
-    if (overridePlatformSupportsEvictWhenNecessary != -1) {
-        platformSupportsEvictWhenNecessary = !!overridePlatformSupportsEvictWhenNecessary;
+void Wddm::setPlatformSupportEvictIfNecessaryFlag(const HwInfoConfig &hwInfoConfig) {
+    platformSupportsEvictIfNecessary = hwInfoConfig.isEvictionIfNecessaryFlagSupported();
+    int32_t overridePlatformSupportsEvictIfNecessary =
+        DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.get();
+    if (overridePlatformSupportsEvictIfNecessary != -1) {
+        platformSupportsEvictIfNecessary = !!overridePlatformSupportsEvictIfNecessary;
     }
     forceEvictOnlyIfNecessary = DebugManager.flags.ForceEvictOnlyIfNecessaryFlag.get();
 }
diff --git a/shared/source/os_interface/windows/wddm/wddm.h b/shared/source/os_interface/windows/wddm/wddm.h
index 29603a5a87..ec0bfdc78e 100644
--- a/shared/source/os_interface/windows/wddm/wddm.h
+++ b/shared/source/os_interface/windows/wddm/wddm.h
@@ -229,7 +229,7 @@ class Wddm : public DriverModel {
     MOCKABLE_VIRTUAL void createPagingFenceLogger();
     bool setLowPriorityContextParam(D3DKMT_HANDLE contextHandle);
     bool adjustEvictNeededParameter(bool evictNeeded) {
-        if (evictNeeded == false && platformSupportsEvictWhenNecessary == false) {
+        if (evictNeeded == false && platformSupportsEvictIfNecessary == false) {
             evictNeeded = true;
         }
         if (forceEvictOnlyIfNecessary != -1) {
@@ -237,7 +237,7 @@ class Wddm : public DriverModel {
         }
         return evictNeeded;
     }
-    void setPlatformSupportEvictWhenNecessaryFlag(const HwInfoConfig &hwInfoConfig);
+    void setPlatformSupportEvictIfNecessaryFlag(const HwInfoConfig &hwInfoConfig);
     void populateAdditionalAdapterInfoOptions(const ADAPTER_INFO_KMD &adapterInfo);
 
     GMM_GFX_PARTITIONING gfxPartition{};
@@ -285,7 +285,7 @@ class Wddm : public DriverModel {
 
     unsigned int enablePreemptionRegValue = 1;
 
-    bool platformSupportsEvictWhenNecessary = false;
+    bool platformSupportsEvictIfNecessary = false;
     bool instrumentationEnabled = false;
 };
 } // namespace NEO
diff --git a/shared/test/common/mocks/mock_hw_info_config.cpp b/shared/test/common/mocks/mock_hw_info_config.cpp
index 3ce1fe6043..e8ada8f683 100644
--- a/shared/test/common/mocks/mock_hw_info_config.cpp
+++ b/shared/test/common/mocks/mock_hw_info_config.cpp
@@ -392,7 +392,7 @@ uint64_t HwInfoConfigHw<IGFX_UNKNOWN>::getHostMemCapabilitiesValue() {
 }
 
 template <>
-bool HwInfoConfigHw<IGFX_UNKNOWN>::isEvictionWhenNecessaryFlagSupported() const {
+bool HwInfoConfigHw<IGFX_UNKNOWN>::isEvictionIfNecessaryFlagSupported() const {
     return true;
 }
 
diff --git a/shared/test/common/mocks/mock_wddm.h b/shared/test/common/mocks/mock_wddm.h
index 0d70632fb0..d77fc9b6b7 100644
--- a/shared/test/common/mocks/mock_wddm.h
+++ b/shared/test/common/mocks/mock_wddm.h
@@ -45,11 +45,11 @@ class WddmMock : public Wddm {
     using Wddm::minAddress;
     using Wddm::pagingFenceAddress;
     using Wddm::pagingQueue;
-    using Wddm::platformSupportsEvictWhenNecessary;
+    using Wddm::platformSupportsEvictIfNecessary;
     using Wddm::populateAdditionalAdapterInfoOptions;
     using Wddm::residencyLogger;
     using Wddm::rootDeviceEnvironment;
-    using Wddm::setPlatformSupportEvictWhenNecessaryFlag;
+    using Wddm::setPlatformSupportEvictIfNecessaryFlag;
     using Wddm::temporaryResources;
     using Wddm::timestampFrequency;
     using Wddm::wddmInterface;
diff --git a/shared/test/common/test_files/igdrcl.config b/shared/test/common/test_files/igdrcl.config
index 6f5b1bf3d9..0445d659e9 100644
--- a/shared/test/common/test_files/igdrcl.config
+++ b/shared/test/common/test_files/igdrcl.config
@@ -423,7 +423,7 @@ BatchBufferStartPrepatchingWaEnabled = -1
 SetVmAdviseAtomicAttribute = -1
 DirectSubmissionForceLocalMemoryStorageMode = -1
 EnableRingSwitchTagUpdateWa = -1
-PlaformSupportEvictWhenNecessaryFlag = -1
+PlaformSupportEvictIfNecessaryFlag = -1
 DirectSubmissionReadBackCommandBuffer = -1
 DirectSubmissionReadBackRingBuffer = -1
 ReadBackCommandBufferAllocation = -1
diff --git a/shared/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp b/shared/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp
index df90f52aec..a2c3b14b3a 100644
--- a/shared/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp
+++ b/shared/test/unit_test/gen11/ehl/test_hw_info_config_ehl.cpp
@@ -75,8 +75,8 @@ EHLTEST_F(EhlHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
     EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::EHL);
 }
 
-EHLTEST_F(EhlHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+EHLTEST_F(EhlHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp b/shared/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp
index d531c01203..f166027a82 100644
--- a/shared/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp
+++ b/shared/test/unit_test/gen11/icllp/test_hw_info_config_icllp.cpp
@@ -102,8 +102,8 @@ ICLLPTEST_F(IcllpHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIs
     EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(*defaultHwInfo), AOT::ICL);
 }
 
-ICLLPTEST_F(IcllpHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+ICLLPTEST_F(IcllpHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp b/shared/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp
index c720ee0d9d..730e0eddf7 100644
--- a/shared/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp
+++ b/shared/test/unit_test/gen11/lkf/test_hw_info_config_lkf.cpp
@@ -94,8 +94,8 @@ LKFTEST_F(LkfHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
     EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::LKF);
 }
 
-LKFTEST_F(LkfHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+LKFTEST_F(LkfHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/gen12lp/adln/test_hw_info_config_adln.cpp b/shared/test/unit_test/gen12lp/adln/test_hw_info_config_adln.cpp
index 8bbaaee2f4..ddee69941e 100644
--- a/shared/test/unit_test/gen12lp/adln/test_hw_info_config_adln.cpp
+++ b/shared/test/unit_test/gen12lp/adln/test_hw_info_config_adln.cpp
@@ -77,8 +77,8 @@ ADLNTEST_F(AdlnHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFo
     EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::ADL_N);
 }
 
-ADLNTEST_F(AdlnHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+ADLNTEST_F(AdlnHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/gen12lp/adlp/test_hw_info_config_adlp.cpp b/shared/test/unit_test/gen12lp/adlp/test_hw_info_config_adlp.cpp
index a6b68c0c70..ebd61866b6 100644
--- a/shared/test/unit_test/gen12lp/adlp/test_hw_info_config_adlp.cpp
+++ b/shared/test/unit_test/gen12lp/adlp/test_hw_info_config_adlp.cpp
@@ -77,8 +77,8 @@ ADLPTEST_F(AdlpHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFo
     EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::ADL_P);
 }
 
-ADLPTEST_F(AdlpHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+ADLPTEST_F(AdlpHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp b/shared/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp
index 3d97cba829..f68d4d6c48 100644
--- a/shared/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp
+++ b/shared/test/unit_test/gen12lp/adls/test_hw_info_config_adls.cpp
@@ -77,8 +77,8 @@ ADLSTEST_F(AdlsHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFo
     EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::ADL_S);
 }
 
-ADLSTEST_F(AdlsHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+ADLSTEST_F(AdlsHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp b/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp
index fd7951c67b..9717ab55e5 100644
--- a/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp
+++ b/shared/test/unit_test/gen12lp/dg1/test_hw_info_config_dg1.cpp
@@ -143,8 +143,8 @@ DG1TEST_F(Dg1HwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
     EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(*defaultHwInfo), AOT::DG1);
 }
 
-DG1TEST_F(Dg1HwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+DG1TEST_F(Dg1HwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp b/shared/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp
index 28abe95d63..7df5f30b73 100644
--- a/shared/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp
+++ b/shared/test/unit_test/gen12lp/rkl/test_hw_info_config_rkl.cpp
@@ -87,8 +87,8 @@ RKLTEST_F(RklHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
     EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::RKL);
 }
 
-RKLTEST_F(RklHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+RKLTEST_F(RklHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/gen12lp/tgllp/hw_info_config_tests_tgllp.cpp b/shared/test/unit_test/gen12lp/tgllp/hw_info_config_tests_tgllp.cpp
index 7cf0cdcaf2..c181525ef1 100644
--- a/shared/test/unit_test/gen12lp/tgllp/hw_info_config_tests_tgllp.cpp
+++ b/shared/test/unit_test/gen12lp/tgllp/hw_info_config_tests_tgllp.cpp
@@ -15,8 +15,8 @@ using namespace NEO;
 
 using HwInfoConfigTestTgllp = ::testing::Test;
 
-TGLLPTEST_F(HwInfoConfigTestTgllp, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+TGLLPTEST_F(HwInfoConfigTestTgllp, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp b/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp
index 225bd10347..0207f32cb9 100644
--- a/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp
+++ b/shared/test/unit_test/gen8/bdw/test_hw_info_config_bdw.cpp
@@ -90,10 +90,10 @@ BDWTEST_F(BdwHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
     EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::BDW);
 }
 
-BDWTEST_F(BdwHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+BDWTEST_F(BdwHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
 
 using CompilerHwInfoConfigHelperTestsBdw = ::testing::Test;
diff --git a/shared/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp b/shared/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp
index a70ef55b5f..1e000a590a 100644
--- a/shared/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp
+++ b/shared/test/unit_test/gen9/bxt/test_hw_info_config_bxt.cpp
@@ -101,8 +101,8 @@ BXTTEST_F(BxtHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
     EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::APL);
 }
 
-BXTTEST_F(BxtHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+BXTTEST_F(BxtHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp b/shared/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp
index ac4b8ea898..d9efadbe08 100644
--- a/shared/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp
+++ b/shared/test/unit_test/gen9/cfl/test_hw_info_config_cfl.cpp
@@ -108,8 +108,8 @@ CFLTEST_F(CflHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
     EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::UNKNOWN_ISA);
 }
 
-CFLTEST_F(CflHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+CFLTEST_F(CflHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp b/shared/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp
index 6d20197dd5..87201b678e 100644
--- a/shared/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp
+++ b/shared/test/unit_test/gen9/glk/test_hw_info_config_glk.cpp
@@ -91,8 +91,8 @@ GLKTEST_F(GlkHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
     EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::GLK);
 }
 
-GLKTEST_F(GlkHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+GLKTEST_F(GlkHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp b/shared/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp
index ecc8c8e852..bfeebd63b6 100644
--- a/shared/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp
+++ b/shared/test/unit_test/gen9/kbl/test_hw_info_config_kbl.cpp
@@ -115,8 +115,8 @@ KBLTEST_F(KblHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
     EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::UNKNOWN_ISA);
 }
 
-KBLTEST_F(KblHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+KBLTEST_F(KblHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp b/shared/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp
index 77628a1114..85cf5fb8c1 100644
--- a/shared/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp
+++ b/shared/test/unit_test/gen9/skl/test_hw_info_config_skl.cpp
@@ -115,8 +115,8 @@ SKLTEST_F(SklHwInfo, givenHwInfoConfigWhenGetProductConfigThenCorrectMatchIsFoun
     EXPECT_EQ(hwInfoConfig.getProductConfigFromHwInfo(hwInfo), AOT::SKL);
 }
 
-SKLTEST_F(SklHwInfo, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+SKLTEST_F(SklHwInfo, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/os_interface/windows/wddm_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_tests.cpp
index c7538e456e..3a7528f3e1 100644
--- a/shared/test/unit_test/os_interface/windows/wddm_tests.cpp
+++ b/shared/test/unit_test/os_interface/windows/wddm_tests.cpp
@@ -123,39 +123,39 @@ TEST_F(WddmTests, whenGetAdapterLuidThenLuidIsReturned) {
     EXPECT_TRUE(luid.HighPart == 0 && luid.LowPart == 0);
 }
 
-TEST_F(WddmTests, GivenDebugFlagDisablesEvictWhenNecessarySupportThenFlagIsFalse) {
+TEST_F(WddmTests, GivenDebugFlagDisablesEvictIfNecessarySupportThenFlagIsFalse) {
     DebugManagerStateRestore restorer{};
-    DebugManager.flags.PlaformSupportEvictWhenNecessaryFlag.set(0);
+    DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.set(0);
 
     auto hwInfoConfig = HwInfoConfig::get(rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily);
 
-    wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwInfoConfig);
-    EXPECT_FALSE(wddm->platformSupportsEvictWhenNecessary);
+    wddm->setPlatformSupportEvictIfNecessaryFlag(*hwInfoConfig);
+    EXPECT_FALSE(wddm->platformSupportsEvictIfNecessary);
 }
 
-TEST_F(WddmTests, GivenDebugFlagEnablesEvictWhenNecessarySupportThenFlagIsTrue) {
+TEST_F(WddmTests, GivenDebugFlagEnablesEvictIfNecessarySupportThenFlagIsTrue) {
     DebugManagerStateRestore restorer{};
-    DebugManager.flags.PlaformSupportEvictWhenNecessaryFlag.set(1);
+    DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.set(1);
 
     auto hwInfoConfig = HwInfoConfig::get(rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily);
 
-    wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwInfoConfig);
-    EXPECT_TRUE(wddm->platformSupportsEvictWhenNecessary);
+    wddm->setPlatformSupportEvictIfNecessaryFlag(*hwInfoConfig);
+    EXPECT_TRUE(wddm->platformSupportsEvictIfNecessary);
 }
 
 TEST_F(WddmTests, givenDebugFlagForceEvictOnlyIfNecessaryAllValuesThenForceSettingIsSetCorrectly) {
     DebugManagerStateRestore restorer{};
     auto hwInfoConfig = HwInfoConfig::get(rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily);
 
-    wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwInfoConfig);
+    wddm->setPlatformSupportEvictIfNecessaryFlag(*hwInfoConfig);
     EXPECT_EQ(-1, wddm->forceEvictOnlyIfNecessary);
 
     DebugManager.flags.ForceEvictOnlyIfNecessaryFlag.set(0);
-    wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwInfoConfig);
+    wddm->setPlatformSupportEvictIfNecessaryFlag(*hwInfoConfig);
     EXPECT_EQ(0, wddm->forceEvictOnlyIfNecessary);
 
     DebugManager.flags.ForceEvictOnlyIfNecessaryFlag.set(1);
-    wddm->setPlatformSupportEvictWhenNecessaryFlag(*hwInfoConfig);
+    wddm->setPlatformSupportEvictIfNecessaryFlag(*hwInfoConfig);
     EXPECT_EQ(1, wddm->forceEvictOnlyIfNecessary);
 }
 
@@ -311,8 +311,8 @@ TEST_F(WddmTests, GivenNoSliceEnabledWhenQueryingTopologyThenExpectFalse) {
     EXPECT_FALSE(wddm->buildTopologyMapping());
 }
 
-TEST_F(WddmTests, GivenPlatformSupportsEvictWhenNecessaryWhenAdjustingEvictNeededTrueThenExpectTrue) {
-    wddm->platformSupportsEvictWhenNecessary = true;
+TEST_F(WddmTests, GivenPlatformSupportsEvictIfNecessaryWhenAdjustingEvictNeededTrueThenExpectTrue) {
+    wddm->platformSupportsEvictIfNecessary = true;
     bool value = wddm->adjustEvictNeededParameter(true);
     EXPECT_TRUE(value);
 }
@@ -322,20 +322,20 @@ TEST_F(WddmTests, GivenWddmWhenAdditionalAdapterInfoOptionIsSetThenCorrectValueI
     EXPECT_EQ(13u, wddm->getAdditionalAdapterInfoOptions());
 }
 
-TEST_F(WddmTests, GivenPlatformNotSupportEvictWhenNecessaryWhenAdjustingEvictNeededTrueThenExpectTrue) {
-    wddm->platformSupportsEvictWhenNecessary = false;
+TEST_F(WddmTests, GivenPlatformNotSupportEvictIfNecessaryWhenAdjustingEvictNeededTrueThenExpectTrue) {
+    wddm->platformSupportsEvictIfNecessary = false;
     bool value = wddm->adjustEvictNeededParameter(true);
     EXPECT_TRUE(value);
 }
 
-TEST_F(WddmTests, GivenPlatformSupportsEvictWhenNecessaryWhenAdjustingEvictNeededFalseThenExpectFalse) {
-    wddm->platformSupportsEvictWhenNecessary = true;
+TEST_F(WddmTests, GivenPlatformSupportsEvictIfNecessaryWhenAdjustingEvictNeededFalseThenExpectFalse) {
+    wddm->platformSupportsEvictIfNecessary = true;
     bool value = wddm->adjustEvictNeededParameter(false);
     EXPECT_FALSE(value);
 }
 
 TEST_F(WddmTests, GivenForceEvictOnlyIfNecessarySetToNotUseTheEvictFlagWhenAdjustingEvictNeededAlwaysIsFalseThenExpectTrue) {
-    wddm->platformSupportsEvictWhenNecessary = true;
+    wddm->platformSupportsEvictIfNecessary = true;
     wddm->forceEvictOnlyIfNecessary = 0;
     bool value = wddm->adjustEvictNeededParameter(false);
     EXPECT_TRUE(value);
@@ -347,8 +347,8 @@ TEST_F(WddmTests, GivenForceEvictOnlyIfNecessarySetToUseEvictFlagWhenAdjustingEv
     EXPECT_FALSE(value);
 }
 
-TEST_F(WddmTests, GivenPlatformNotSupportEvictWhenNecessaryWhenAdjustingEvictNeededFalseThenExpectTrue) {
-    wddm->platformSupportsEvictWhenNecessary = false;
+TEST_F(WddmTests, GivenPlatformNotSupportEvictIfNecessaryWhenAdjustingEvictNeededFalseThenExpectTrue) {
+    wddm->platformSupportsEvictIfNecessary = false;
     bool value = wddm->adjustEvictNeededParameter(false);
     EXPECT_TRUE(value);
 }
diff --git a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/hw_info_config_tests_xe_hp_sdv.cpp b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/hw_info_config_tests_xe_hp_sdv.cpp
index e3f5d1e052..b68406ac53 100644
--- a/shared/test/unit_test/xe_hp_core/xe_hp_sdv/hw_info_config_tests_xe_hp_sdv.cpp
+++ b/shared/test/unit_test/xe_hp_core/xe_hp_sdv/hw_info_config_tests_xe_hp_sdv.cpp
@@ -15,8 +15,8 @@ using namespace NEO;
 
 using HwInfoConfigTestXeHpSdv = ::testing::Test;
 
-XEHPTEST_F(HwInfoConfigTestXeHpSdv, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+XEHPTEST_F(HwInfoConfigTestXeHpSdv, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
diff --git a/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp
index 0ebe24ecbe..ba04b64615 100644
--- a/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp
+++ b/shared/test/unit_test/xe_hpc_core/pvc/test_hw_info_config_pvc.cpp
@@ -64,10 +64,10 @@ PVCTEST_F(PVCHwInfoConfig, givenPvcHwInfoWhenIsIpSamplingSupportedThenCorrectRes
     }
 }
 
-PVCTEST_F(PVCHwInfoConfig, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+PVCTEST_F(PVCHwInfoConfig, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }
 
 PVCTEST_F(PVCHwInfoConfig, givenPVCHwInfoConfigWhenIsPrefetcherDisablingInDirectSubmissionRequiredThenFalseIsReturned) {
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp
index 284a12c11a..b47caabb2a 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/hw_info_config_tests_dg2.cpp
@@ -504,8 +504,8 @@ DG2TEST_F(HwInfoConfigTestDg2, givenHwInfoConfigWhenAskedIfStorageInfoAdjustment
     }
 }
 
-DG2TEST_F(HwInfoConfigTestDg2, givenHwInfoConfigWhenGettingEvictWhenNecessaryFlagSupportedThenExpectTrue) {
+DG2TEST_F(HwInfoConfigTestDg2, givenHwInfoConfigWhenGettingEvictIfNecessaryFlagSupportedThenExpectTrue) {
     HardwareInfo hwInfo = *defaultHwInfo;
     const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
-    EXPECT_TRUE(hwInfoConfig.isEvictionWhenNecessaryFlagSupported());
+    EXPECT_TRUE(hwInfoConfig.isEvictionIfNecessaryFlagSupported());
 }