diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordRestClient.cs
similarity index 98%
rename from src/Discord.Net/DiscordClient.cs
rename to src/Discord.Net/DiscordRestClient.cs
index ff1ce9c0b..dbb6e9916 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordRestClient.cs
@@ -13,7 +13,7 @@ using System.Runtime.InteropServices;
 
 namespace Discord
 {
-    public class DiscordClient : IDiscordClient
+    public class DiscordRestClient : IDiscordClient
     {
         private readonly object _eventLock = new object();
 
@@ -37,9 +37,9 @@ namespace Discord
         public LoginState LoginState { get; private set; }
 
         /// <summary> Creates a new REST-only discord client. </summary>
-        public DiscordClient() : this(new DiscordConfig()) { }
+        public DiscordRestClient() : this(new DiscordConfig()) { }
         /// <summary> Creates a new REST-only discord client. </summary>
-        public DiscordClient(DiscordConfig config)
+        public DiscordRestClient(DiscordConfig config)
         {
             LogManager = new LogManager(config.LogLevel);
             LogManager.Message += async msg => await _logEvent.InvokeAsync(msg).ConfigureAwait(false);
diff --git a/src/Discord.Net/DiscordSocketClient.cs b/src/Discord.Net/DiscordSocketClient.cs
index 82936d5f0..031f24df4 100644
--- a/src/Discord.Net/DiscordSocketClient.cs
+++ b/src/Discord.Net/DiscordSocketClient.cs
@@ -16,7 +16,7 @@ using System.Threading.Tasks;
 
 namespace Discord
 {
-    public partial class DiscordSocketClient : DiscordClient, IDiscordClient
+    public partial class DiscordSocketClient : DiscordRestClient, IDiscordClient
     {
         private readonly ConcurrentQueue<ulong> _largeGuilds;
         private readonly ILogger _gatewayLogger;
diff --git a/src/Discord.Net/Entities/Application.cs b/src/Discord.Net/Entities/Application.cs
index bee814fb4..677dd2aab 100644
--- a/src/Discord.Net/Entities/Application.cs
+++ b/src/Discord.Net/Entities/Application.cs
@@ -13,12 +13,12 @@ namespace Discord
         public string[] RPCOrigins { get; private set; }
         public ulong Flags { get; private set; }
 
-        public override DiscordClient Discord { get; }
+        public override DiscordRestClient Discord { get; }
         public IUser Owner { get; private set; }
 
         public string IconUrl => API.CDN.GetApplicationIconUrl(Id, _iconId);
 
-        public Application(DiscordClient discord, Model model)
+        public Application(DiscordRestClient discord, Model model)
             : base(model.Id)
         {
             Discord = discord;
diff --git a/src/Discord.Net/Entities/Channels/DMChannel.cs b/src/Discord.Net/Entities/Channels/DMChannel.cs
index 8f79ddccd..dee579432 100644
--- a/src/Discord.Net/Entities/Channels/DMChannel.cs
+++ b/src/Discord.Net/Entities/Channels/DMChannel.cs
@@ -13,13 +13,13 @@ namespace Discord
     [DebuggerDisplay(@"{DebuggerDisplay,nq}")]
     internal class DMChannel : SnowflakeEntity, IDMChannel
     {
-        public override DiscordClient Discord { get; }
+        public override DiscordRestClient Discord { get; }
         public IUser Recipient { get; private set; }
 
         public virtual IReadOnlyCollection<IMessage> CachedMessages => ImmutableArray.Create<IMessage>();
         IReadOnlyCollection<IUser> IPrivateChannel.Recipients => ImmutableArray.Create(Recipient);
 
-        public DMChannel(DiscordClient discord, IUser recipient, Model model)
+        public DMChannel(DiscordRestClient discord, IUser recipient, Model model)
             : base(model.Id)
         {
             Discord = discord;
diff --git a/src/Discord.Net/Entities/Channels/GroupChannel.cs b/src/Discord.Net/Entities/Channels/GroupChannel.cs
index 8169bfb9c..929d050cd 100644
--- a/src/Discord.Net/Entities/Channels/GroupChannel.cs
+++ b/src/Discord.Net/Entities/Channels/GroupChannel.cs
@@ -18,14 +18,14 @@ namespace Discord
         protected ConcurrentDictionary<ulong, GroupUser> _users;
         private string _iconId;
         
-        public override DiscordClient Discord { get; }
+        public override DiscordRestClient Discord { get; }
         public string Name { get; private set; }
 
         public IReadOnlyCollection<IUser> Recipients => _users.ToReadOnlyCollection();
         public virtual IReadOnlyCollection<IMessage> CachedMessages => ImmutableArray.Create<IMessage>();
         public string IconUrl => API.CDN.GetChannelIconUrl(Id, _iconId);
 
-        public GroupChannel(DiscordClient discord, Model model)
+        public GroupChannel(DiscordRestClient discord, Model model)
             : base(model.Id)
         {
             Discord = discord;
diff --git a/src/Discord.Net/Entities/Channels/GuildChannel.cs b/src/Discord.Net/Entities/Channels/GuildChannel.cs
index fac9b045a..637fd4bcd 100644
--- a/src/Discord.Net/Entities/Channels/GuildChannel.cs
+++ b/src/Discord.Net/Entities/Channels/GuildChannel.cs
@@ -19,7 +19,7 @@ namespace Discord
 
         public Guild Guild { get; private set; }
 
-        public override DiscordClient Discord => Guild.Discord;
+        public override DiscordRestClient Discord => Guild.Discord;
 
         public GuildChannel(Guild guild, Model model)
             : base(model.Id)
diff --git a/src/Discord.Net/Entities/Entity.cs b/src/Discord.Net/Entities/Entity.cs
index cd6d34cff..8e8e7587f 100644
--- a/src/Discord.Net/Entities/Entity.cs
+++ b/src/Discord.Net/Entities/Entity.cs
@@ -4,7 +4,7 @@
     {
         public T Id { get; }
 
-        public abstract DiscordClient Discord { get; }
+        public abstract DiscordRestClient Discord { get; }
 
         internal virtual bool IsAttached => false;
         bool IEntity<T>.IsAttached => IsAttached;
diff --git a/src/Discord.Net/Entities/Guilds/Guild.cs b/src/Discord.Net/Entities/Guilds/Guild.cs
index cc360813d..f3b385010 100644
--- a/src/Discord.Net/Entities/Guilds/Guild.cs
+++ b/src/Discord.Net/Entities/Guilds/Guild.cs
@@ -27,7 +27,7 @@ namespace Discord
         public MfaLevel MfaLevel { get; private set; }
         public DefaultMessageNotifications DefaultMessageNotifications { get; private set; }
 
-        public override DiscordClient Discord { get; }
+        public override DiscordRestClient Discord { get; }
         public ulong? AFKChannelId { get; private set; }
         public ulong? EmbedChannelId { get; private set; }
         public ulong OwnerId { get; private set; }
@@ -42,7 +42,7 @@ namespace Discord
         public Role EveryoneRole => GetRole(Id);
         public IReadOnlyCollection<IRole> Roles => _roles.ToReadOnlyCollection();
 
-        public Guild(DiscordClient discord, Model model)
+        public Guild(DiscordRestClient discord, Model model)
             : base(model.Id)
         {
             Discord = discord;
diff --git a/src/Discord.Net/Entities/Guilds/GuildIntegration.cs b/src/Discord.Net/Entities/Guilds/GuildIntegration.cs
index 0aba4d4e3..fa2ceddda 100644
--- a/src/Discord.Net/Entities/Guilds/GuildIntegration.cs
+++ b/src/Discord.Net/Entities/Guilds/GuildIntegration.cs
@@ -23,7 +23,7 @@ namespace Discord
         public User User { get; private set; }
         public IntegrationAccount Account { get; private set; }
 
-        public override DiscordClient Discord => Guild.Discord;
+        public override DiscordRestClient Discord => Guild.Discord;
         public DateTimeOffset SyncedAt => DateTimeUtils.FromTicks(_syncedAtTicks);
 
         public GuildIntegration(Guild guild, Model model)
diff --git a/src/Discord.Net/Entities/Guilds/UserGuild.cs b/src/Discord.Net/Entities/Guilds/UserGuild.cs
index 9d76817e5..77c28192d 100644
--- a/src/Discord.Net/Entities/Guilds/UserGuild.cs
+++ b/src/Discord.Net/Entities/Guilds/UserGuild.cs
@@ -13,11 +13,11 @@ namespace Discord
         public bool IsOwner { get; private set; }
         public GuildPermissions Permissions { get; private set; }
 
-        public override DiscordClient Discord { get; }
+        public override DiscordRestClient Discord { get; }
 
         public string IconUrl => API.CDN.GetGuildIconUrl(Id, _iconId);
 
-        public UserGuild(DiscordClient discord, Model model)
+        public UserGuild(DiscordRestClient discord, Model model)
             : base(model.Id)
         {
             Discord = discord;
diff --git a/src/Discord.Net/Entities/Invites/Invite.cs b/src/Discord.Net/Entities/Invites/Invite.cs
index 90e380582..7b5421d2d 100644
--- a/src/Discord.Net/Entities/Invites/Invite.cs
+++ b/src/Discord.Net/Entities/Invites/Invite.cs
@@ -13,13 +13,13 @@ namespace Discord
 
         public ulong ChannelId { get; private set; }
         public ulong GuildId { get; private set; }
-        public override DiscordClient Discord { get; }
+        public override DiscordRestClient Discord { get; }
 
         public string Code => Id;
         public string Url => $"{DiscordConfig.InviteUrl}/{XkcdCode ?? Code}";
         public string XkcdUrl => XkcdCode != null ? $"{DiscordConfig.InviteUrl}/{XkcdCode}" : null;
 
-        public Invite(DiscordClient discord, Model model)
+        public Invite(DiscordRestClient discord, Model model)
             : base(model.Code)
         {
             Discord = discord;
diff --git a/src/Discord.Net/Entities/Invites/InviteMetadata.cs b/src/Discord.Net/Entities/Invites/InviteMetadata.cs
index 6c334a79f..df7d965af 100644
--- a/src/Discord.Net/Entities/Invites/InviteMetadata.cs
+++ b/src/Discord.Net/Entities/Invites/InviteMetadata.cs
@@ -16,7 +16,7 @@ namespace Discord
 
         public DateTimeOffset CreatedAt => DateTimeUtils.FromTicks(_createdAtTicks);
 
-        public InviteMetadata(DiscordClient client, Model model)
+        public InviteMetadata(DiscordRestClient client, Model model)
             : base(client, model)
         {
             Update(model, UpdateSource.Creation);
diff --git a/src/Discord.Net/Entities/Messages/Message.cs b/src/Discord.Net/Entities/Messages/Message.cs
index 186ca7308..1dbf0c6a1 100644
--- a/src/Discord.Net/Entities/Messages/Message.cs
+++ b/src/Discord.Net/Entities/Messages/Message.cs
@@ -29,7 +29,7 @@ namespace Discord
         public IReadOnlyCollection<IRole> MentionedRoles { get; private set; }
         public IReadOnlyCollection<IUser> MentionedUsers { get; private set; }
 
-        public override DiscordClient Discord => (Channel as Entity<ulong>).Discord;
+        public override DiscordRestClient Discord => (Channel as Entity<ulong>).Discord;
         public DateTimeOffset? EditedTimestamp => DateTimeUtils.FromTicks(_editedTimestampTicks);
         public DateTimeOffset Timestamp => DateTimeUtils.FromTicks(_timestampTicks);
 
diff --git a/src/Discord.Net/Entities/Roles/Role.cs b/src/Discord.Net/Entities/Roles/Role.cs
index dd06cc507..2b14662ad 100644
--- a/src/Discord.Net/Entities/Roles/Role.cs
+++ b/src/Discord.Net/Entities/Roles/Role.cs
@@ -23,7 +23,7 @@ namespace Discord
         
         public bool IsEveryone => Id == Guild.Id;
         public string Mention => MentionUtils.Mention(this);
-        public override DiscordClient Discord => Guild.Discord;
+        public override DiscordRestClient Discord => Guild.Discord;
 
         public Role(Guild guild, Model model)
             : base(model.Id)
diff --git a/src/Discord.Net/Entities/Users/GuildUser.cs b/src/Discord.Net/Entities/Users/GuildUser.cs
index e9e82b54d..5d39ee7e3 100644
--- a/src/Discord.Net/Entities/Users/GuildUser.cs
+++ b/src/Discord.Net/Entities/Users/GuildUser.cs
@@ -37,7 +37,7 @@ namespace Discord
         public virtual UserStatus Status => UserStatus.Unknown;
         public virtual Game Game => null;
 
-        public DiscordClient Discord => Guild.Discord;
+        public DiscordRestClient Discord => Guild.Discord;
         public DateTimeOffset? JoinedAt => DateTimeUtils.FromTicks(_joinedAtTicks);
 
         public GuildUser(Guild guild, User user)
diff --git a/src/Discord.Net/Entities/Users/SelfUser.cs b/src/Discord.Net/Entities/Users/SelfUser.cs
index e4f67b5d6..a320c5960 100644
--- a/src/Discord.Net/Entities/Users/SelfUser.cs
+++ b/src/Discord.Net/Entities/Users/SelfUser.cs
@@ -18,9 +18,9 @@ namespace Discord
         public override UserStatus Status => _status;
         public override Game Game => _game;
 
-        public override DiscordClient Discord { get; }
+        public override DiscordRestClient Discord { get; }
 
-        public SelfUser(DiscordClient discord, Model model)
+        public SelfUser(DiscordRestClient discord, Model model)
             : base(model)
         {
             Discord = discord;
diff --git a/src/Discord.Net/Entities/Users/User.cs b/src/Discord.Net/Entities/Users/User.cs
index e6628fe3e..640084f7b 100644
--- a/src/Discord.Net/Entities/Users/User.cs
+++ b/src/Discord.Net/Entities/Users/User.cs
@@ -13,7 +13,7 @@ namespace Discord
         public string Username { get; private set; }
         public ushort DiscriminatorValue { get; private set; }
 
-        public override DiscordClient Discord { get { throw new NotSupportedException(); } }
+        public override DiscordRestClient Discord { get { throw new NotSupportedException(); } }
 
         public string AvatarUrl => API.CDN.GetUserAvatarUrl(Id, _avatarId);
         public string Discriminator => DiscriminatorValue.ToString("D4");
diff --git a/src/Discord.Net/Extensions/DiscordClientExtensions.cs b/src/Discord.Net/Extensions/DiscordClientExtensions.cs
index 53e09c0e0..dcde721d5 100644
--- a/src/Discord.Net/Extensions/DiscordClientExtensions.cs
+++ b/src/Discord.Net/Extensions/DiscordClientExtensions.cs
@@ -5,7 +5,7 @@ namespace Discord.Extensions
 {
     public static class DiscordClientExtensions
     {
-        public static async Task<IVoiceRegion> GetOptimalVoiceRegionAsync(this DiscordClient discord)
+        public static async Task<IVoiceRegion> GetOptimalVoiceRegionAsync(this DiscordRestClient discord)
         {
             var regions = await discord.GetVoiceRegionsAsync().ConfigureAwait(false);
             return regions.FirstOrDefault(x => x.IsOptimal);