diff --git a/src/Discord.Net.Core/Entities/Channels/IChannel.cs b/src/Discord.Net.Core/Entities/Channels/IChannel.cs
index b66f778fb..18d02ce42 100644
--- a/src/Discord.Net.Core/Entities/Channels/IChannel.cs
+++ b/src/Discord.Net.Core/Entities/Channels/IChannel.cs
@@ -8,14 +8,6 @@ namespace Discord
     /// </summary>
     public interface IChannel : ISnowflakeEntity
     {
-        /// <summary>
-        ///     Gets the name of this channel.
-        /// </summary>
-        /// <returns>
-        ///     A string containing the name of this channel.
-        /// </returns>
-        string Name { get; }
-
         /// <summary>
         ///     Gets a collection of all users in this channel.
         /// </summary>
diff --git a/src/Discord.Net.Core/Entities/Channels/IGuildChannel.cs b/src/Discord.Net.Core/Entities/Channels/IGuildChannel.cs
index c3a2161cc..8e49ae7e4 100644
--- a/src/Discord.Net.Core/Entities/Channels/IGuildChannel.cs
+++ b/src/Discord.Net.Core/Entities/Channels/IGuildChannel.cs
@@ -12,6 +12,14 @@ namespace Discord
     /// <seealso cref="ICategoryChannel"/>
     public interface IGuildChannel : IChannel, IDeletable
     {
+        /// <summary>
+        ///     Gets the name of this channel.
+        /// </summary>
+        /// <returns>
+        ///     A string containing the name of this channel.
+        /// </returns>
+        string Name { get; }
+
         /// <summary>
         ///     Gets the position of this channel.
         /// </summary>
diff --git a/src/Discord.Net.Core/Utils/MentionUtils.cs b/src/Discord.Net.Core/Utils/MentionUtils.cs
index 6ffb7eee6..a2fb942f0 100644
--- a/src/Discord.Net.Core/Utils/MentionUtils.cs
+++ b/src/Discord.Net.Core/Utils/MentionUtils.cs
@@ -204,7 +204,7 @@ namespace Discord
         {
             if (mode != TagHandling.Remove)
             {
-                var channel = tag.Value as IChannel;
+                var channel = tag.Value as IGuildChannel;
                 switch (mode)
                 {
                     case TagHandling.Name:
diff --git a/src/Discord.Net.Rest/Entities/Channels/RestChannel.cs b/src/Discord.Net.Rest/Entities/Channels/RestChannel.cs
index dd190199f..37112dc35 100644
--- a/src/Discord.Net.Rest/Entities/Channels/RestChannel.cs
+++ b/src/Discord.Net.Rest/Entities/Channels/RestChannel.cs
@@ -54,8 +54,6 @@ namespace Discord.Rest
         public virtual Task UpdateAsync(RequestOptions options = null) => Task.Delay(0);
 
         //IChannel
-        /// <inheritdoc />
-        string IChannel.Name => null;
 
         /// <inheritdoc />
         Task<IUser> IChannel.GetUserAsync(ulong id, CacheMode mode, RequestOptions options)
diff --git a/src/Discord.Net.Rest/Entities/Channels/RestDMChannel.cs b/src/Discord.Net.Rest/Entities/Channels/RestDMChannel.cs
index bee096273..4ab3f7a5b 100644
--- a/src/Discord.Net.Rest/Entities/Channels/RestDMChannel.cs
+++ b/src/Discord.Net.Rest/Entities/Channels/RestDMChannel.cs
@@ -210,8 +210,6 @@ namespace Discord.Rest
             => await SendMessageAsync(text, isTTS, embed, options).ConfigureAwait(false);
 
         //IChannel
-        /// <inheritdoc />
-        string IChannel.Name => $"@{Recipient}";
 
         /// <inheritdoc />
         Task<IUser> IChannel.GetUserAsync(ulong id, CacheMode mode, RequestOptions options)
diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketChannel.cs
index 13c0c9b4f..daec9abab 100644
--- a/src/Discord.Net.WebSocket/Entities/Channels/SocketChannel.cs
+++ b/src/Discord.Net.WebSocket/Entities/Channels/SocketChannel.cs
@@ -58,8 +58,6 @@ namespace Discord.WebSocket
         internal SocketChannel Clone() => MemberwiseClone() as SocketChannel;
 
         //IChannel
-        /// <inheritdoc />
-        string IChannel.Name => null;
 
         /// <inheritdoc />
         Task<IUser> IChannel.GetUserAsync(ulong id, CacheMode mode, RequestOptions options)
diff --git a/src/Discord.Net.WebSocket/Entities/Channels/SocketDMChannel.cs b/src/Discord.Net.WebSocket/Entities/Channels/SocketDMChannel.cs
index 6b6577167..37ab4ed56 100644
--- a/src/Discord.Net.WebSocket/Entities/Channels/SocketDMChannel.cs
+++ b/src/Discord.Net.WebSocket/Entities/Channels/SocketDMChannel.cs
@@ -300,8 +300,6 @@ namespace Discord.WebSocket
             => await SendMessageAsync(text, isTTS, embed, options).ConfigureAwait(false);
 
         //IChannel
-        /// <inheritdoc />
-        string IChannel.Name => $"@{Recipient}";
 
         /// <inheritdoc />
         Task<IUser> IChannel.GetUserAsync(ulong id, CacheMode mode, RequestOptions options)