diff --git a/bot/chat/chat.go b/bot/msg/chat.go
similarity index 96%
rename from bot/chat/chat.go
rename to bot/msg/chat.go
index 578d84d..9a98f04 100644
--- a/bot/chat/chat.go
+++ b/bot/msg/chat.go
@@ -1,4 +1,4 @@
-package chat
+package msg
 
 import (
 	"fmt"
@@ -13,14 +13,14 @@ import (
 	"github.com/google/uuid"
 )
 
-type Chat struct {
+type Manager struct {
 	c *bot.Client
 	p *basic.Player
 }
 
-func NewChat(c *bot.Client, p *basic.Player, events EventsHandler) *Chat {
+func New(c *bot.Client, p *basic.Player, events EventsHandler) *Manager {
 	attachPlayerMsg(c, p, events.PlayerChatMessage)
-	return &Chat{c, p}
+	return &Manager{c, p}
 }
 
 func attachPlayerMsg(c *bot.Client, p *basic.Player, handler func(msg chat.Message) error) {
diff --git a/bot/chat/events.go b/bot/msg/events.go
similarity index 89%
rename from bot/chat/events.go
rename to bot/msg/events.go
index 60db083..f4e7648 100644
--- a/bot/chat/events.go
+++ b/bot/msg/events.go
@@ -1,4 +1,4 @@
-package chat
+package msg
 
 import "github.com/Tnze/go-mc/chat"
 
diff --git a/examples/autofish/autofish.go b/examples/autofish/autofish.go
index acf2e81..70f8fe6 100644
--- a/examples/autofish/autofish.go
+++ b/examples/autofish/autofish.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Tnze/go-mc/bot"
 	"github.com/Tnze/go-mc/bot/basic"
-	botchat "github.com/Tnze/go-mc/bot/chat"
+	"github.com/Tnze/go-mc/bot/msg"
 	"github.com/Tnze/go-mc/chat"
 	_ "github.com/Tnze/go-mc/data/lang/en-us"
 	"github.com/Tnze/go-mc/data/packetid"
@@ -20,7 +20,7 @@ const timeout = 45
 var (
 	c  *bot.Client
 	p  *basic.Player
-	bc *botchat.Chat
+	bc *msg.Manager
 
 	watch chan time.Time
 )
@@ -34,7 +34,7 @@ func main() {
 		Disconnect: onDisconnect,
 		Death:      onDeath,
 	})
-	bc = botchat.NewChat(c, p, botchat.EventsHandler{PlayerChatMessage: onChatMsg})
+	bc = msg.New(c, p, msg.EventsHandler{PlayerChatMessage: onChatMsg})
 
 	// Register event handlers
 
diff --git a/examples/daze/daze.go b/examples/daze/daze.go
index 50fb411..f5a2324 100644
--- a/examples/daze/daze.go
+++ b/examples/daze/daze.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/Tnze/go-mc/bot"
 	"github.com/Tnze/go-mc/bot/basic"
-	botchat "github.com/Tnze/go-mc/bot/chat"
+	"github.com/Tnze/go-mc/bot/msg"
 	"github.com/Tnze/go-mc/bot/screen"
 	"github.com/Tnze/go-mc/bot/world"
 	"github.com/Tnze/go-mc/chat"
@@ -31,7 +31,7 @@ var (
 var (
 	client        *bot.Client
 	player        *basic.Player
-	chatHandler   *botchat.Chat
+	chatHandler   *msg.Manager
 	worldManager  *world.World
 	screenManager *screen.Manager
 )
@@ -52,7 +52,7 @@ func main() {
 		HealthChange: onHealthChange,
 		Death:        onDeath,
 	})
-	chatHandler = botchat.NewChat(client, player, botchat.EventsHandler{
+	chatHandler = msg.New(client, player, msg.EventsHandler{
 		PlayerChatMessage: onPlayerMsg,
 	})
 	worldManager = world.NewWorld(client, player, world.EventsListener{