diff --git a/src/Discord.Net/API/Common.cs b/src/Discord.Net/API/Common.cs
index 508bb1df4..9885b3cd5 100644
--- a/src/Discord.Net/API/Common.cs
+++ b/src/Discord.Net/API/Common.cs
@@ -32,10 +32,20 @@ namespace Discord.API
 	{
 		[JsonProperty("user_id")]
 		public string UserId;
-		[JsonProperty("user")]
-		public UserReference User;
 		[JsonProperty("guild_id")]
 		public string GuildId;
+
+		[JsonProperty("user")]
+		private UserReference _user;
+		public UserReference User
+		{
+			get { return _user; }
+			set
+			{
+				_user = value;
+				UserId = User.Id;
+			}
+		}
 	}
 	public class MemberInfo : MemberReference
 	{
@@ -47,9 +57,9 @@ namespace Discord.API
 	public class ExtendedMemberInfo : MemberInfo
 	{
 		[JsonProperty("mute")]
-		public bool? IsMuted;
+		public bool? IsServerMuted;
 		[JsonProperty("deaf")]
-		public bool? IsDeafened;
+		public bool? IsServerDeafened;
 	}
 	public class PresenceMemberInfo : MemberReference
 	{
@@ -62,20 +72,21 @@ namespace Discord.API
 	{
 		[JsonProperty("channel_id")]
 		public string ChannelId;
-		[JsonProperty("suppress")]
-		public bool? IsSuppressed;
 		[JsonProperty("session_id")]
 		public string SessionId;
+		[JsonProperty("token")]
+		public string Token;
+
 		[JsonProperty("self_mute")]
 		public bool? IsSelfMuted;
 		[JsonProperty("self_deaf")]
 		public bool? IsSelfDeafened;
 		[JsonProperty("mute")]
-		public bool? IsMuted;
+		public bool? IsServerMuted;
 		[JsonProperty("deaf")]
-		public bool? IsDeafened;
-		[JsonProperty("token")]
-		public string Token;
+		public bool? IsServerDeafened;
+		[JsonProperty("suppress")]
+		public bool? IsServerSuppressed;
 	}
 
 	//Channels
diff --git a/src/Discord.Net/Models/Member.cs b/src/Discord.Net/Models/Member.cs
index c45adfcc5..c784fbb47 100644
--- a/src/Discord.Net/Models/Member.cs
+++ b/src/Discord.Net/Models/Member.cs
@@ -22,11 +22,11 @@ namespace Discord
 		/// <summary> Returns the datetime that this user joined this server. </summary>
 		public DateTime JoinedAt { get; private set; }
 
-		public bool IsMuted { get; private set; }
-		public bool IsDeafened { get; private set; }
 		public bool IsSelfMuted { get; private set; }
 		public bool IsSelfDeafened { get; private set; }
-		public bool IsSuppressed { get; private set; }
+		public bool IsServerMuted { get; private set; }
+		public bool IsServerDeafened { get; private set; }
+		public bool IsServerSuppressed { get; private set; }
 		public bool IsSpeaking { get; internal set; }
 
 		public string SessionId { get; private set; }
@@ -105,10 +105,10 @@ namespace Discord
 		internal void Update(API.ExtendedMemberInfo model)
 		{
 			Update(model as API.MemberInfo);
-			if (model.IsDeafened != null)
-				IsDeafened = model.IsDeafened.Value;
-			if (model.IsMuted != null)
-				IsMuted = model.IsMuted.Value;
+			if (model.IsServerDeafened != null)
+				IsServerDeafened = model.IsServerDeafened.Value;
+			if (model.IsServerMuted != null)
+				IsServerMuted = model.IsServerMuted.Value;
 		}
 		internal void Update(API.PresenceMemberInfo model)
 		{
@@ -123,10 +123,10 @@ namespace Discord
 		}
 		internal void Update(API.VoiceMemberInfo model)
 		{
-			if (model.IsDeafened != null)
-				IsDeafened = model.IsDeafened.Value;
-			if (model.IsMuted != null)
-				IsMuted = model.IsMuted.Value;
+			if (model.IsServerDeafened != null)
+				IsServerDeafened = model.IsServerDeafened.Value;
+			if (model.IsServerMuted != null)
+				IsServerMuted = model.IsServerMuted.Value;
 			if (model.SessionId != null)
 				SessionId = model.SessionId;
 			if (model.Token != null)
@@ -138,8 +138,8 @@ namespace Discord
 				IsSelfDeafened = model.IsSelfDeafened.Value;
 			if (model.IsSelfMuted != null)
 				IsSelfMuted = model.IsSelfMuted.Value;
-			if (model.IsSuppressed != null)
-				IsSuppressed = model.IsSuppressed.Value;
+			if (model.IsServerSuppressed != null)
+				IsServerSuppressed = model.IsServerSuppressed.Value;
 		}
 
 		internal void UpdateActivity(DateTime? activity = null)