diff --git a/src/Discord.Net/DiscordClient.Channels.cs b/src/Discord.Net/DiscordClient.Channels.cs
index 33532cbcc..e2ff289da 100644
--- a/src/Discord.Net/DiscordClient.Channels.cs
+++ b/src/Discord.Net/DiscordClient.Channels.cs
@@ -162,7 +162,7 @@ namespace Discord
 		}
 		
 		/// <summary> Destroys the provided channel. </summary>
-		public async Task DestroyChannel(Channel channel)
+		public async Task DeleteChannel(Channel channel)
 		{
 			if (channel == null) throw new ArgumentNullException(nameof(channel));
 			CheckReady();
diff --git a/src/Discord.Net/DiscordClient.Invites.cs b/src/Discord.Net/DiscordClient.Invites.cs
index 4e61992e9..10d1ee016 100644
--- a/src/Discord.Net/DiscordClient.Invites.cs
+++ b/src/Discord.Net/DiscordClient.Invites.cs
@@ -61,7 +61,7 @@ namespace Discord
 		}
 
 		/// <summary> Deletes the provided invite. </summary>
-		public async Task DestroyInvite(Invite invite)
+		public async Task DeleteInvite(Invite invite)
 		{
 			if (invite == null) throw new ArgumentNullException(nameof(invite));
 			CheckReady();
diff --git a/src/Discord.Net/DiscordClient.Messages.cs b/src/Discord.Net/DiscordClient.Messages.cs
index ee1d32647..0d4ce4b52 100644
--- a/src/Discord.Net/DiscordClient.Messages.cs
+++ b/src/Discord.Net/DiscordClient.Messages.cs
@@ -239,7 +239,7 @@ namespace Discord
 
 		private Task MessageQueueLoop()
 		{
-			var cancelToken = CancelToken;
+			var cancelToken = _cancelToken;
 			int interval = Config.MessageQueueInterval;
 
 			return Task.Run(async () =>
diff --git a/src/Discord.Net/DiscordClient.Permissions.cs b/src/Discord.Net/DiscordClient.Permissions.cs
index 98065428e..e98235e32 100644
--- a/src/Discord.Net/DiscordClient.Permissions.cs
+++ b/src/Discord.Net/DiscordClient.Permissions.cs
@@ -7,7 +7,7 @@ namespace Discord
 {
 	public partial class DiscordClient
 	{
-		public Task SetChannelUserPermissions(Channel channel, User user, ChannelPermissions allow = null, ChannelPermissions deny = null)
+		public Task SetChannelPermissions(Channel channel, User user, ChannelPermissions allow = null, ChannelPermissions deny = null)
 		{
 			if (channel == null) throw new ArgumentNullException(nameof(channel));
 			if (user == null) throw new ArgumentNullException(nameof(user));
@@ -15,7 +15,7 @@ namespace Discord
 
 			return SetChannelPermissions(channel, user?.Id, PermissionTarget.User, allow, deny);
 		}
-		public Task SetChannelUserPermissions(Channel channel, User user, DualChannelPermissions permissions = null)
+		public Task SetChannelPermissions(Channel channel, User user, DualChannelPermissions permissions = null)
 		{
 			if (channel == null) throw new ArgumentNullException(nameof(channel));
 			if (user == null) throw new ArgumentNullException(nameof(user));
@@ -23,7 +23,7 @@ namespace Discord
 
 			return SetChannelPermissions(channel, user?.Id, PermissionTarget.User, permissions?.Allow, permissions?.Deny);
 		}
-		public Task SetChannelRolePermissions(Channel channel, Role role, ChannelPermissions allow = null, ChannelPermissions deny = null)
+		public Task SetChannelPermissions(Channel channel, Role role, ChannelPermissions allow = null, ChannelPermissions deny = null)
 		{
 			if (channel == null) throw new ArgumentNullException(nameof(channel));
 			if (role == null) throw new ArgumentNullException(nameof(role));
@@ -31,7 +31,7 @@ namespace Discord
 
 			return SetChannelPermissions(channel, role?.Id, PermissionTarget.Role, allow, deny);
 		}
-		public Task SetChannelRolePermissions(Channel channel, Role role, DualChannelPermissions permissions = null)
+		public Task SetChannelPermissions(Channel channel, Role role, DualChannelPermissions permissions = null)
 		{
 			if (channel == null) throw new ArgumentNullException(nameof(channel));
 			if (role == null) throw new ArgumentNullException(nameof(role));
@@ -42,7 +42,7 @@ namespace Discord
 		private Task SetChannelPermissions(Channel channel, string targetId, PermissionTarget targetType, ChannelPermissions allow = null, ChannelPermissions deny = null)
 			=> _api.SetChannelPermissions(channel.Id, targetId, targetType.Value, allow?.RawValue ?? 0, deny?.RawValue ?? 0);
 
-		public Task RemoveChannelUserPermissions(Channel channel, User user)
+		public Task RemoveChannelPermissions(Channel channel, User user)
 		{
 			if (channel == null) throw new ArgumentNullException(nameof(channel));
 			if (user == null) throw new ArgumentNullException(nameof(user));
@@ -50,7 +50,7 @@ namespace Discord
 
 			return RemoveChannelPermissions(channel, user?.Id, PermissionTarget.User);
 		}
-		public Task RemoveChannelRolePermissions(Channel channel, Role role)
+		public Task RemoveChannelPermissions(Channel channel, Role role)
 		{
 			if (channel == null) throw new ArgumentNullException(nameof(channel));
 			if (role == null) throw new ArgumentNullException(nameof(role));
diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index c1e77ec5d..c162c237f 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -51,7 +51,7 @@ namespace Discord
 
 			this.Connected += async (s, e) =>
 			{
-				_api.CancelToken = CancelToken;
+				_api.CancelToken = _cancelToken;
 				await SendStatus().ConfigureAwait(false);
 			};
 
diff --git a/src/Discord.Net/DiscordWSClient.cs b/src/Discord.Net/DiscordWSClient.cs
index eefc3cc9f..a05dd1204 100644
--- a/src/Discord.Net/DiscordWSClient.cs
+++ b/src/Discord.Net/DiscordWSClient.cs
@@ -42,7 +42,7 @@ namespace Discord
 
 		public CancellationToken CancelToken => _cancelToken;
 		private CancellationTokenSource _cancelTokenSource;
-		private CancellationToken _cancelToken;
+		protected CancellationToken _cancelToken;
 
 		/// <summary> Initializes a new instance of the DiscordClient class. </summary>
 		public DiscordWSClient(DiscordWSClientConfig config = null)
@@ -309,7 +309,7 @@ namespace Discord
 							{
 								string token = e.Payload.Value<string>("token");
 								_voiceSocket.Host = "wss://" + e.Payload.Value<string>("endpoint").Split(':')[0];
-								await _voiceSocket.Login(_userId, _dataSocket.SessionId, token, CancelToken).ConfigureAwait(false);
+								await _voiceSocket.Login(_userId, _dataSocket.SessionId, token, _cancelToken).ConfigureAwait(false);
 							}
 						}
 						break;
diff --git a/test/Discord.Net.Tests/Tests.cs b/test/Discord.Net.Tests/Tests.cs
index ed5a5f890..69c4c0dfe 100644
--- a/test/Discord.Net.Tests/Tests.cs
+++ b/test/Discord.Net.Tests/Tests.cs
@@ -66,7 +66,7 @@ namespace Discord.Tests
 
 			AssertEvent<ChannelEventArgs>(
 				"ChannelDestroyed event never received",
-				async () => await _hostClient.DestroyChannel(channel),
+				async () => await _hostClient.DeleteChannel(channel),
 				x => _targetBot.ChannelDestroyed += x,
 				x => _targetBot.ChannelDestroyed -= x,
 				(s, e) => e.Channel.Name == name);