diff --git a/state/state.go b/state/state.go
index 5a5371d..08c0a16 100644
--- a/state/state.go
+++ b/state/state.go
@@ -151,8 +151,8 @@ func (s *State) Permissions(
 
 ////
 
-func (s *State) Self() (*discord.User, error) {
-	u, err := s.Store.Self()
+func (s *State) Me() (*discord.User, error) {
+	u, err := s.Store.Me()
 	if err == nil {
 		return u, nil
 	}
@@ -162,7 +162,7 @@ func (s *State) Self() (*discord.User, error) {
 		return nil, err
 	}
 
-	return u, s.Store.SelfSet(u)
+	return u, s.Store.MyselfSet(u)
 }
 
 ////
diff --git a/state/state_events.go b/state/state_events.go
index 68757f4..e46026c 100644
--- a/state/state_events.go
+++ b/state/state_events.go
@@ -22,6 +22,9 @@ func (s *State) onEvent(iface interface{}) {
 
 	switch ev := iface.(type) {
 	case *gateway.ReadyEvent:
+		// Set Ready to the state
+		s.Ready = *ev
+
 		// Handle guilds
 		for _, g := range ev.Guilds {
 			g := g
@@ -45,9 +48,6 @@ func (s *State) onEvent(iface interface{}) {
 			s.stateErr(err, "Failed to set self in state")
 		}
 
-		// Set Ready to the state
-		s.Ready = *ev
-
 	case *gateway.GuildCreateEvent:
 		if err := s.Store.GuildSet(&ev.Guild); err != nil {
 			s.stateErr(err, "Failed to create guild in state")
diff --git a/state/store.go b/state/store.go
index 298531e..34f7e8c 100644
--- a/state/store.go
+++ b/state/store.go
@@ -22,7 +22,7 @@ type Store interface {
 // well). The best way to avoid this is to copy the whole slice, like
 // DefaultStore does.
 type StoreGetter interface {
-	Self() (*discord.User, error)
+	Me() (*discord.User, error)
 
 	Channel(id discord.Snowflake) (*discord.Channel, error)
 	Channels(guildID discord.Snowflake) ([]discord.Channel, error)
@@ -50,7 +50,7 @@ type StoreGetter interface {
 }
 
 type StoreModifier interface {
-	SelfSet(me *discord.User) error
+	MyselfSet(me *discord.User) error
 
 	// ChannelSet should switch on Type to know if it's a private channel or
 	// not.
diff --git a/state/store_default.go b/state/store_default.go
index 7d96ee6..f34393a 100644
--- a/state/store_default.go
+++ b/state/store_default.go
@@ -66,7 +66,7 @@ func (s *DefaultStore) Reset() error {
 
 ////
 
-func (s *DefaultStore) Self() (*discord.User, error) {
+func (s *DefaultStore) Me() (*discord.User, error) {
 	s.mut.Lock()
 	defer s.mut.Unlock()
 
@@ -77,7 +77,7 @@ func (s *DefaultStore) Self() (*discord.User, error) {
 	return &s.self, nil
 }
 
-func (s *DefaultStore) SelfSet(me *discord.User) error {
+func (s *DefaultStore) MyselfSet(me *discord.User) error {
 	s.mut.Lock()
 	s.self = *me
 	s.mut.Unlock()