diff --git a/src/Discord.Net/DiscordClient.Events.cs b/src/Discord.Net/DiscordClient.Events.cs
index 5d2577627..5e9b5bc09 100644
--- a/src/Discord.Net/DiscordClient.Events.cs
+++ b/src/Discord.Net/DiscordClient.Events.cs
@@ -5,7 +5,7 @@ namespace Discord
 {
     public partial class DiscordClient
     {
-        public event EventHandler LoggedIn = delegate { };
+        public event EventHandler Ready = delegate { };
         //public event EventHandler<DisconnectedEventArgs> LoggedOut = delegate { };
         public event EventHandler<ChannelEventArgs> ChannelCreated = delegate { };
         public event EventHandler<ChannelEventArgs> ChannelDestroyed = delegate { };
@@ -31,8 +31,8 @@ namespace Discord
         public event EventHandler<UserUpdatedEventArgs> UserUpdated = delegate { };
         public event EventHandler<UserEventArgs> UserUnbanned = delegate { };
 
-        private void OnLoggedIn()
-            => OnEvent(LoggedIn);
+        private void OnReady()
+            => OnEvent(Ready);
         /*private void OnLoggedOut(bool wasUnexpected, Exception ex)
             => OnEvent(LoggedOut, new DisconnectedEventArgs(wasUnexpected, ex));*/
 
diff --git a/src/Discord.Net/DiscordClient.cs b/src/Discord.Net/DiscordClient.cs
index b43278ca8..51d35ed90 100644
--- a/src/Discord.Net/DiscordClient.cs
+++ b/src/Discord.Net/DiscordClient.cs
@@ -268,7 +268,7 @@ namespace Discord
                 }
 
                 SendStatus();
-                OnLoggedIn();
+                OnReady();
             }
         }
 
@@ -484,6 +484,8 @@ namespace Discord
                     //Global
                     case "READY":
                         {
+                            //TODO: None of this is really threadsafe - should only replace the cache collections when they have been fully populated
+
                             var data = e.Payload.ToObject<ReadyEvent>(Serializer);
 
                             int channelCount = 0;