diff --git a/src/Adapter/Build/Common/MSTest.TestAdapter.props b/src/Adapter/Build/Common/MSTest.TestAdapter.props
index 29c76cbab7..d1c6c0d1c0 100644
--- a/src/Adapter/Build/Common/MSTest.TestAdapter.props
+++ b/src/Adapter/Build/Common/MSTest.TestAdapter.props
@@ -2,7 +2,7 @@
   
   <PropertyGroup>
     <EnableMSTestV2CopyResources Condition=" '$(EnableMSTestV2CopyResources)' == '' ">true</EnableMSTestV2CopyResources>
-    <UseMSTestRunner Condition=" '$(UseMSTestRunner)' == '' ">false</UseMSTestRunner>
+    <EnableMSTestRunner Condition=" '$(EnableMSTestRunner)' == '' ">false</EnableMSTestRunner>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Adapter/Build/Common/MSTest.TestAdapter.targets b/src/Adapter/Build/Common/MSTest.TestAdapter.targets
index 597bcbf21f..4e4379affb 100644
--- a/src/Adapter/Build/Common/MSTest.TestAdapter.targets
+++ b/src/Adapter/Build/Common/MSTest.TestAdapter.targets
@@ -1,7 +1,7 @@
 <Project>
 
   <ItemGroup>
-    <TestAdapterContent Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" Condition=" '$(UseMSTestRunner)' != 'true' ">
+    <TestAdapterContent Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" Condition=" '$(EnableMSTestRunner)' != 'true' ">
       <Link>Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
@@ -25,7 +25,7 @@
       (i.e. `<None Remove="@(TestAdapterContent)" />`)
       -->
     <None Include="@(TestAdapterContent)" />
-    <Reference Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" Condition=" '$(UseMSTestRunner)' == 'true' " />
+    <Reference Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" Condition=" '$(EnableMSTestRunner)' == 'true' " />
   </ItemGroup>
 
   <Target Name="GetMSTestV2CultureHierarchy">
diff --git a/src/Adapter/Build/NetWithWinUI/MSTest.TestAdapter.targets b/src/Adapter/Build/NetWithWinUI/MSTest.TestAdapter.targets
index 6037cf2872..cfef710c8b 100644
--- a/src/Adapter/Build/NetWithWinUI/MSTest.TestAdapter.targets
+++ b/src/Adapter/Build/NetWithWinUI/MSTest.TestAdapter.targets
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <TestAdapterContent Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" Condition=" '$(UseMSTestRunner)' != 'true' ">
+    <TestAdapterContent Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" Condition=" '$(EnableMSTestRunner)' != 'true' ">
       <Link>Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Visible>False</Visible>
@@ -31,7 +31,7 @@
       (i.e. `<None Remove="@(TestAdapterContent)" />`)
       -->
     <None Include="@(TestAdapterContent)" />
-    <Reference Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" Condition=" '$(UseMSTestRunner)' == 'true' " />
+    <Reference Include="$(MSBuildThisFileDirectory)Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.dll" Condition=" '$(EnableMSTestRunner)' == 'true' " />
   </ItemGroup>
 
   <Target Name="GetMSTestV2CultureHierarchy">
diff --git a/src/Package/MSTest.Sdk/Sdk/Sdk.props.template b/src/Package/MSTest.Sdk/Sdk/Sdk.props.template
index 412fb5e4f1..387c1a0f17 100644
--- a/src/Package/MSTest.Sdk/Sdk/Sdk.props.template
+++ b/src/Package/MSTest.Sdk/Sdk/Sdk.props.template
@@ -4,7 +4,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
   
   <PropertyGroup>
-    <UseMSTestRunner>true</UseMSTestRunner>
+    <EnableMSTestRunner>true</EnableMSTestRunner>
     <TestingPlatformDonetTestSupport>false</TestingPlatformDonetTestSupport>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/Package/MSTest.Sdk/Sdk/Sdk.targets b/src/Package/MSTest.Sdk/Sdk/Sdk.targets
index 5eed2c6c21..37ebf6777c 100644
--- a/src/Package/MSTest.Sdk/Sdk/Sdk.targets
+++ b/src/Package/MSTest.Sdk/Sdk/Sdk.targets
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="_SetupEntryPoint" BeforeTargets="GenerateProgramFile" Condition=" '$(UseMSTestRunner)' == 'false' " >
+  <Target Name="_SetupEntryPoint" BeforeTargets="GenerateProgramFile" Condition=" '$(EnableMSTestRunner)' == 'false' " >
     <PropertyGroup>
       <!-- Disable testing platform entry point generation -->
       <GenerateTestingPlatformEntryPoint>false</GenerateTestingPlatformEntryPoint>