diff --git a/state.go b/state.go
index 5b22480..88b30f5 100644
--- a/state.go
+++ b/state.go
@@ -24,9 +24,9 @@ func (s *State) OnReady(r *Ready) error {
 	return nil
 }
 
-// AddGuild adds a guild to the current world state, or
+// GuildAdd adds a guild to the current world state, or
 // updates it if it already exists.
-func (s *State) AddGuild(guild *Guild) error {
+func (s *State) GuildAdd(guild *Guild) error {
 	if s == nil {
 		return nilError
 	}
@@ -35,10 +35,10 @@ func (s *State) AddGuild(guild *Guild) error {
 		if g.ID == guild.ID {
 			// This could be a little faster ;)
 			for _, m := range guild.Members {
-				s.AddMember(&m)
+				s.MemberAdd(&m)
 			}
 			for _, c := range guild.Channels {
-				s.AddChannel(&c)
+				s.ChannelAdd(&c)
 			}
 			return nil
 		}
@@ -47,8 +47,8 @@ func (s *State) AddGuild(guild *Guild) error {
 	return nil
 }
 
-// RemoveGuild removes a guild from current world state.
-func (s *State) RemoveGuild(guild *Guild) error {
+// GuildRemove removes a guild from current world state.
+func (s *State) GuildRemove(guild *Guild) error {
 	if s == nil {
 		return nilError
 	}
@@ -81,9 +81,9 @@ func (s *State) Guild(guildID string) (*Guild, error) {
 
 // TODO: Consider moving Guild state update methods onto *Guild.
 
-// AddMember adds a member to the current world state, or
+// MemberAdd adds a member to the current world state, or
 // updates it if it already exists.
-func (s *State) AddMember(member *Member) error {
+func (s *State) MemberAdd(member *Member) error {
 	if s == nil {
 		return nilError
 	}
@@ -104,8 +104,8 @@ func (s *State) AddMember(member *Member) error {
 	return nil
 }
 
-// RemoveMember removes a member from current world state.
-func (s *State) RemoveMember(member *Member) error {
+// MemberRemove removes a member from current world state.
+func (s *State) MemberRemove(member *Member) error {
 	if s == nil {
 		return nilError
 	}
@@ -145,11 +145,11 @@ func (s *State) Member(guildID string, userID string) (*Member, error) {
 	return nil, errors.New("Member not found.")
 }
 
-// AddChannel adds a guild to the current world state, or
+// ChannelAdd adds a guild to the current world state, or
 // updates it if it already exists.
 // Channels may exist either as PrivateChannels or inside
 // a guild.
-func (s *State) AddChannel(channel *Channel) error {
+func (s *State) ChannelAdd(channel *Channel) error {
 	if s == nil {
 		return nilError
 	}
@@ -181,8 +181,8 @@ func (s *State) AddChannel(channel *Channel) error {
 	return nil
 }
 
-// RemoveChannel removes a channel from current world state.
-func (s *State) RemoveChannel(channel *Channel) error {
+// ChannelRemove removes a channel from current world state.
+func (s *State) ChannelRemove(channel *Channel) error {
 	if s == nil {
 		return nilError
 	}
diff --git a/wsapi.go b/wsapi.go
index cbe3332..b8fbd76 100644
--- a/wsapi.go
+++ b/wsapi.go
@@ -241,7 +241,7 @@ func (s *Session) event(messageType int, message []byte) (err error) {
 		var st Channel
 		if err = unmarshalEvent(e, &st); err == nil {
 			if s.StateEnabled {
-				s.State.AddChannel(&st)
+				s.State.ChannelAdd(&st)
 			}
 			if s.OnChannelCreate != nil {
 				s.OnChannelCreate(s, st)
@@ -252,7 +252,7 @@ func (s *Session) event(messageType int, message []byte) (err error) {
 		var st Channel
 		if err = unmarshalEvent(e, &st); err == nil {
 			if s.StateEnabled {
-				s.State.AddChannel(&st)
+				s.State.ChannelAdd(&st)
 			}
 			if s.OnChannelUpdate != nil {
 				s.OnChannelUpdate(s, st)
@@ -263,7 +263,7 @@ func (s *Session) event(messageType int, message []byte) (err error) {
 		var st Channel
 		if err = unmarshalEvent(e, &st); err == nil {
 			if s.StateEnabled {
-				s.State.RemoveChannel(&st)
+				s.State.ChannelRemove(&st)
 			}
 			if s.OnChannelDelete != nil {
 				s.OnChannelDelete(s, st)
@@ -274,7 +274,7 @@ func (s *Session) event(messageType int, message []byte) (err error) {
 		var st Guild
 		if err = unmarshalEvent(e, &st); err == nil {
 			if s.StateEnabled {
-				s.State.AddGuild(&st)
+				s.State.GuildAdd(&st)
 			}
 			if s.OnGuildCreate != nil {
 				s.OnGuildCreate(s, st)
@@ -285,7 +285,7 @@ func (s *Session) event(messageType int, message []byte) (err error) {
 		var st Guild
 		if err = unmarshalEvent(e, &st); err == nil {
 			if s.StateEnabled {
-				s.State.AddGuild(&st)
+				s.State.GuildAdd(&st)
 			}
 			if s.OnGuildCreate != nil {
 				s.OnGuildUpdate(s, st)
@@ -296,7 +296,7 @@ func (s *Session) event(messageType int, message []byte) (err error) {
 		var st Guild
 		if err = unmarshalEvent(e, &st); err == nil {
 			if s.StateEnabled {
-				s.State.RemoveGuild(&st)
+				s.State.GuildRemove(&st)
 			}
 			if s.OnGuildDelete != nil {
 				s.OnGuildDelete(s, st)
@@ -307,7 +307,7 @@ func (s *Session) event(messageType int, message []byte) (err error) {
 		var st Member
 		if err = unmarshalEvent(e, &st); err == nil {
 			if s.StateEnabled {
-				s.State.AddMember(&st)
+				s.State.MemberAdd(&st)
 			}
 			if s.OnGuildMemberAdd != nil {
 				s.OnGuildMemberAdd(s, st)
@@ -318,7 +318,7 @@ func (s *Session) event(messageType int, message []byte) (err error) {
 		var st Member
 		if err = unmarshalEvent(e, &st); err == nil {
 			if s.StateEnabled {
-				s.State.RemoveMember(&st)
+				s.State.MemberRemove(&st)
 			}
 			if s.OnGuildMemberRemove != nil {
 				s.OnGuildMemberRemove(s, st)
@@ -329,7 +329,7 @@ func (s *Session) event(messageType int, message []byte) (err error) {
 		var st Member
 		if err = unmarshalEvent(e, &st); err == nil {
 			if s.StateEnabled {
-				s.State.AddMember(&st)
+				s.State.MemberAdd(&st)
 			}
 			if s.OnGuildMemberUpdate != nil {
 				s.OnGuildMemberUpdate(s, st)