diff --git a/src/MonoTorrent.Tests/Client/InitialSeedUnchokerTests.cs b/src/MonoTorrent.Tests/Client/InitialSeedUnchokerTests.cs
index f633195da..d7d1ededc 100644
--- a/src/MonoTorrent.Tests/Client/InitialSeedUnchokerTests.cs
+++ b/src/MonoTorrent.Tests/Client/InitialSeedUnchokerTests.cs
@@ -61,7 +61,7 @@ public void Teardown ()
         public async Task Setup ()
         {
             rig.Manager.UploadingTo = 0;
-            await rig.Manager.UpdateSettings (new TorrentSettingsBuilder (rig.Manager.Settings) { UploadSlots = 4 }.ToSettings ());
+            await rig.Manager.UpdateSettingsAsync (new TorrentSettingsBuilder (rig.Manager.Settings) { UploadSlots = 4 }.ToSettings ());
             peer = rig.CreatePeer (true);
             unchoker = new InitialSeedUnchoker (rig.Manager);
             unchoker.PeerConnected (peer);
@@ -147,7 +147,7 @@ public async Task Advertise7 ()
         {
             PeerId other = rig.CreatePeer (true);
             // Check that peers which don't share only get a small number of pieces to share
-            await rig.Manager.UpdateSettings (new TorrentSettingsBuilder (rig.Manager.Settings) { UploadSlots = 1 }.ToSettings ());
+            await rig.Manager.UpdateSettingsAsync (new TorrentSettingsBuilder (rig.Manager.Settings) { UploadSlots = 1 }.ToSettings ());
             unchoker.PeerDisconnected (peer);
             List<PeerId> peers = new List<PeerId> (new[] { peer, rig.CreatePeer (true) });
             peers.ForEach (unchoker.PeerConnected);
@@ -209,7 +209,7 @@ public async Task Choke2 ()
 
             // More peers than slots
             unchoker.PeerDisconnected (this.peer);
-            await rig.Manager.UpdateSettings (new TorrentSettingsBuilder (rig.Manager.Settings) { UploadSlots = 1 }.ToSettings ());
+            await rig.Manager.UpdateSettingsAsync (new TorrentSettingsBuilder (rig.Manager.Settings) { UploadSlots = 1 }.ToSettings ());
 
             List<PeerId> peers = new List<PeerId> (new[] { this.peer, rig.CreatePeer (true), rig.CreatePeer (true) });
             peers.ForEach (unchoker.PeerConnected);
diff --git a/src/MonoTorrent.Tests/MonoTorrent.Client.Modes/DownloadModeTests.cs b/src/MonoTorrent.Tests/MonoTorrent.Client.Modes/DownloadModeTests.cs
index 25c4f8820..21a1c127e 100644
--- a/src/MonoTorrent.Tests/MonoTorrent.Client.Modes/DownloadModeTests.cs
+++ b/src/MonoTorrent.Tests/MonoTorrent.Client.Modes/DownloadModeTests.cs
@@ -81,7 +81,7 @@ public void Teardown ()
         [Test]
         public async Task AddPeers_TooMany ()
         {
-            await Manager.UpdateSettings (new TorrentSettingsBuilder (Manager.Settings) { MaximumConnections = 100 }.ToSettings ());
+            await Manager.UpdateSettingsAsync (new TorrentSettingsBuilder (Manager.Settings) { MaximumConnections = 100 }.ToSettings ());
 
             var peers = new List<Peer> ();
             for (int i = 0; i < Manager.Settings.MaximumPeerDetails + 100; i++)
diff --git a/src/MonoTorrent/MonoTorrent.Client/Managers/TorrentManager.cs b/src/MonoTorrent/MonoTorrent.Client/Managers/TorrentManager.cs
index 3a265cad1..fc1aa65f4 100644
--- a/src/MonoTorrent/MonoTorrent.Client/Managers/TorrentManager.cs
+++ b/src/MonoTorrent/MonoTorrent.Client/Managers/TorrentManager.cs
@@ -697,7 +697,7 @@ public async Task StopAsync (TimeSpan timeout)
             }
         }
 
-        public async Task UpdateSettings (TorrentSettings settings)
+        public async Task UpdateSettingsAsync (TorrentSettings settings)
         {
             await ClientEngine.MainLoop;
             Settings = settings;