diff --git a/src/Discord.Net/Models/Server.cs b/src/Discord.Net/Models/Server.cs
index 6189b62e3..d6689d1a4 100644
--- a/src/Discord.Net/Models/Server.cs
+++ b/src/Discord.Net/Models/Server.cs
@@ -12,7 +12,7 @@ namespace Discord
 		/// <summary> Returns the name of this channel. </summary>
 		public string Name { get; private set; }
 		/// <summary> Returns the current logged-in user's data for this server. </summary>
-		public User CurrentMember { get; internal set; }
+		public User CurrentUser { get; internal set; }
 
 		/// <summary> Returns the amount of time (in seconds) a user must be inactive for until they are automatically moved to the AFK channel (see AFKChannel). </summary>
 		public int AFKTimeout { get; private set; }
diff --git a/src/Discord.Net/Models/User.cs b/src/Discord.Net/Models/User.cs
index d1c9a5b26..4fba8ae5b 100644
--- a/src/Discord.Net/Models/User.cs
+++ b/src/Discord.Net/Models/User.cs
@@ -121,14 +121,14 @@ namespace Discord
 				x =>
 				{
 					x.AddMember(this);
-					if (x.Id == _client.CurrentUserId)
-						x.CurrentMember = this;
+					if (Id == _client.CurrentUserId)
+						x.CurrentUser = this;
                 }, 
 				x =>
 				{
 					x.RemoveMember(this);
-					if (x.Id == _client.CurrentUserId)
-						x.CurrentMember = null;
+					if (Id == _client.CurrentUserId)
+						x.CurrentUser = null;
 				});
 			Status = UserStatus.Offline;
 			_channels = new ConcurrentDictionary<string, Channel>();