diff --git a/ref/Entities/Channels/IPublicChannel.cs b/ref/Entities/Channels/IPublicChannel.cs
index 91bdf81a6..f0e868bc7 100644
--- a/ref/Entities/Channels/IPublicChannel.cs
+++ b/ref/Entities/Channels/IPublicChannel.cs
@@ -15,9 +15,9 @@ namespace Discord
         int Position { get; }   
 
         /// <summary> Gets the permission overwrite for a specific user, or null if one does not exist. </summary>
-        Task<PermissionOverwrite?> GetPermissionOverwrite(User user);
+        PermissionOverwrite? GetPermissionOverwrite(User user);
         /// <summary> Gets the permission overwrite for a specific role, or null if one does not exist. </summary>
-        Task<PermissionOverwrite?> GetPermissionOverwrite(Role role);
+        PermissionOverwrite? GetPermissionOverwrite(Role role);
         /// <summary> Downloads a collection of all invites to this server. </summary>
         Task<IEnumerable<Invite>> GetInvites();
         
diff --git a/ref/Entities/Channels/PrivateChannel.cs b/ref/Entities/Channels/PrivateChannel.cs
index 80f3284c1..4d21f3902 100644
--- a/ref/Entities/Channels/PrivateChannel.cs
+++ b/ref/Entities/Channels/PrivateChannel.cs
@@ -9,7 +9,7 @@ namespace Discord
         /// <inheritdoc />
         public ulong Id { get; }
         /// <inheritdoc />
-        public DiscordClient Client { get; }
+        public DiscordClient Discord { get; }
         /// <inheritdoc />
         public ModelState State { get; }
         /// <inheritdoc />
diff --git a/ref/Entities/Channels/TextChannel.cs b/ref/Entities/Channels/TextChannel.cs
index 9b96ff02c..8596d73f8 100644
--- a/ref/Entities/Channels/TextChannel.cs
+++ b/ref/Entities/Channels/TextChannel.cs
@@ -9,6 +9,9 @@ namespace Discord
     {
         public sealed class Properties
         {
+            public string Name { get; }
+            public string Topic { get; }
+            public int Position { get; }
         }
 
         /// <inheritdoc />
@@ -44,6 +47,10 @@ namespace Discord
         public IEnumerable<User> Users { get; }
 
         /// <inheritdoc />
+        public PermissionOverwrite? GetPermissionOverwrite(User user) => null;
+        /// <inheritdoc />
+        public PermissionOverwrite? GetPermissionOverwrite(Role role) => null;
+        /// <inheritdoc />
         public Task<IEnumerable<User>> GetUsers() => null;
         /// <inheritdoc />
         public Task<Message> GetMessage(ulong id) => null;
@@ -52,10 +59,6 @@ namespace Discord
         /// <inheritdoc />
         public Task<IEnumerable<Message>> GetMessages(int limit = 100, ulong? relativeMessageId = null, Relative relativeDir = Relative.Before) => null;
         /// <inheritdoc />
-        public Task<PermissionOverwrite?> GetPermissionOverwrite(User user) => null;
-        /// <inheritdoc />
-        public Task<PermissionOverwrite?> GetPermissionOverwrite(Role role) => null;
-        /// <inheritdoc />
         public Task<IEnumerable<Invite>> GetInvites() => null;
 
         /// <inheritdoc />
diff --git a/ref/Entities/Channels/VoiceChannel.cs b/ref/Entities/Channels/VoiceChannel.cs
index f1a93ce01..6a6232a9d 100644
--- a/ref/Entities/Channels/VoiceChannel.cs
+++ b/ref/Entities/Channels/VoiceChannel.cs
@@ -8,13 +8,15 @@ namespace Discord
     {
         public sealed class Properties
         {
+            public string Name { get; }
             public int Bitrate { get; set; }
+            public int Position { get; }
         }
 
         /// <inheritdoc />
         public ulong Id { get; }
         /// <inheritdoc />
-        public DiscordClient Client { get; }
+        public DiscordClient Discord { get; }
         /// <inheritdoc />
         public ModelState State { get; }
         /// <inheritdoc />
diff --git a/ref/Entities/IEntity.cs b/ref/Entities/IEntity.cs
index b95312519..eb30ddd55 100644
--- a/ref/Entities/IEntity.cs
+++ b/ref/Entities/IEntity.cs
@@ -11,7 +11,7 @@ namespace Discord
     public interface IEntity
     {
         /// <summary> Gets the DiscordClient that manages this object. </summary>
-        DiscordClient Client { get; }
+        DiscordClient Discord { get; }
         /// <summary> Gets the state of this object. </summary>
         ModelState State { get; }