diff --git a/BUILDGUIDE.md b/BUILDGUIDE.md
index 3b933dfa11..825af0c93a 100644
--- a/BUILDGUIDE.md
+++ b/BUILDGUIDE.md
@@ -177,7 +177,7 @@ Tests can be built and run with custom Target Frameworks. See the below examples
 
 Managed SNI can be enabled on Windows by enabling the below AppContext switch:
 
-**"Microsoft.Data.SqlClient.UseManagedNetworkingOnWindows"**
+**"Switch.Microsoft.Data.SqlClient.UseManagedNetworkingOnWindows"**
 
 ## Set truncation on for scaled decimal parameters
 
diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectFactory.Windows.cs b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectFactory.Windows.cs
index c96c32a551..193babd231 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectFactory.Windows.cs
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/TdsParserStateObjectFactory.Windows.cs
@@ -11,7 +11,7 @@ internal sealed class TdsParserStateObjectFactory
     {
         public static readonly TdsParserStateObjectFactory Singleton = new TdsParserStateObjectFactory();
 
-        private const string UseManagedNetworkingOnWindows = "Microsoft.Data.SqlClient.UseManagedNetworkingOnWindows";
+        private const string UseManagedNetworkingOnWindows = "Switch.Microsoft.Data.SqlClient.UseManagedNetworkingOnWindows";
 
         private static bool shouldUseManagedSNI;
 
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index eb4009c363..b26a732d16 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -43,7 +43,7 @@ public static class DataTestUtility
 
         public const string UdtTestDbName = "UdtTestDb";
         public const string AKVKeyName = "TestSqlClientAzureKeyVaultProvider";
-        private const string ManagedNetworkingAppContextSwitch = "Microsoft.Data.SqlClient.UseManagedNetworkingOnWindows";
+        private const string ManagedNetworkingAppContextSwitch = "Switch.Microsoft.Data.SqlClient.UseManagedNetworkingOnWindows";
 
         private static readonly string[] AzureSqlServerEndpoints = {".database.windows.net",
                                                                      ".database.cloudapi.de",
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index b4aaf443ac..a5079f9f52 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -63,7 +63,6 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
         <dependency id="System.Memory" version="4.5.4" exclude="Compile" />
         <dependency id="System.Security.Principal.Windows" version="4.7.0" exclude="Compile" />
         <dependency id="System.Text.Encoding.CodePages" version="4.7.0" exclude="Compile" />
-        <dependency id="System.Configuration.ConfigurationManager" version="4.7.0" exclude="Compile" />
         <dependency id="Microsoft.Identity.Client" version="4.7.1" exclude="Compile"/>
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.6.0" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="5.6.0" />