diff --git a/bot/login.go b/bot/login.go
index d3a448f..62c58b2 100644
--- a/bot/login.go
+++ b/bot/login.go
@@ -46,7 +46,7 @@ func (c *Client) joinLogin(conn *net.Conn) error {
 		}
 	}
 	err = conn.WritePacket(pk.Marshal(
-		packetid.ServerboundLoginStart,
+		packetid.ServerboundLoginHello,
 		pk.String(c.Auth.Name),
 		pk.UUID(c.UUID),
 	))
@@ -63,7 +63,7 @@ func (c *Client) joinLogin(conn *net.Conn) error {
 
 		// Handle Packet
 		switch packetid.ClientboundPacketID(p.ID) {
-		case packetid.ClientboundLoginDisconnect: // LoginDisconnect
+		case packetid.ClientboundLoginLoginDisconnect: // LoginDisconnect
 			var reason chat.JsonMessage
 			err = p.Scan(&reason)
 			if err != nil {
@@ -71,13 +71,13 @@ func (c *Client) joinLogin(conn *net.Conn) error {
 			}
 			return LoginErr{"disconnect", DisconnectErr(reason)}
 
-		case packetid.ClientboundLoginEncryptionRequest: // Encryption Request
+		case packetid.ClientboundLoginHello: // Encryption Request
 			if err := handleEncryptionRequest(conn, c, p); err != nil {
 				return LoginErr{"encryption", err}
 			}
 			receiving = "set compression"
 
-		case packetid.ClientboundLoginSuccess: // Login Success
+		case packetid.ClientboundLoginGameProfile: // Login Success
 			err := p.Scan(
 				(*pk.UUID)(&c.UUID),
 				(*pk.String)(&c.Name),
@@ -85,13 +85,13 @@ func (c *Client) joinLogin(conn *net.Conn) error {
 			if err != nil {
 				return LoginErr{"login success", err}
 			}
-			err = conn.WritePacket(pk.Marshal(packetid.ServerboundLoginAcknowledged))
+			err = conn.WritePacket(pk.Marshal(packetid.ServerboundLoginLoginAcknowledged))
 			if err != nil {
 				return LoginErr{"login success", err}
 			}
 			return nil
 
-		case packetid.ClientboundLoginCompression: // Set Compression
+		case packetid.ClientboundLoginLoginCompression: // Set Compression
 			var threshold pk.VarInt
 			if err := p.Scan(&threshold); err != nil {
 				return LoginErr{"compression", err}
@@ -99,7 +99,7 @@ func (c *Client) joinLogin(conn *net.Conn) error {
 			conn.SetThreshold(int(threshold))
 			receiving = "login success"
 
-		case packetid.ClientboundLoginPluginRequest: // Login Plugin Request
+		case packetid.ClientboundLoginCustomQuery: // Login Plugin Request
 			var (
 				msgid   pk.VarInt
 				channel pk.Identifier
@@ -119,7 +119,7 @@ func (c *Client) joinLogin(conn *net.Conn) error {
 			}
 
 			if err := conn.WritePacket(pk.Marshal(
-				packetid.ServerboundLoginPluginResponse,
+				packetid.ServerboundLoginCustomQueryAnswer,
 				msgid, PluginMessageData,
 			)); err != nil {
 				return LoginErr{"login Plugin", err}
diff --git a/bot/pinglist.go b/bot/pinglist.go
index 26d2eaf..02473cd 100644
--- a/bot/pinglist.go
+++ b/bot/pinglist.go
@@ -94,7 +94,7 @@ func pingAndList(ctx context.Context, addr string, conn *mcnet.Conn) (data []byt
 	// LIST
 	// 请求服务器状态
 	err = conn.WritePacket(pk.Marshal(
-		packetid.ServerboundStatusRequest,
+		packetid.ServerboundStatusStatusRequest,
 	))
 	if err != nil {
 		return nil, 0, fmt.Errorf("bot: send list packect fail: %v", err)
diff --git a/server/auth/auth.go b/server/auth/auth.go
index 3f95b44..a8d2634 100644
--- a/server/auth/auth.go
+++ b/server/auth/auth.go
@@ -79,7 +79,7 @@ func Encrypt(conn *net.Conn, name string, serverKey *rsa.PrivateKey) (*Resp, err
 
 func encryptionRequest(conn *net.Conn, publicKey, verifyToken []byte) error {
 	return conn.WritePacket(pk.Marshal(
-		packetid.ClientboundLoginEncryptionRequest,
+		packetid.ClientboundLoginHello,
 		pk.String(""),
 		pk.ByteArray(publicKey),
 		pk.ByteArray(verifyToken),
@@ -92,7 +92,7 @@ func encryptionResponse(conn *net.Conn, serverKey *rsa.PrivateKey, verifyToken [
 	if err != nil {
 		return nil, err
 	}
-	if packetid.ServerboundPacketID(p.ID) != packetid.ServerboundLoginEncryptionResponse {
+	if packetid.ServerboundPacketID(p.ID) != packetid.ServerboundLoginKey {
 		return nil, fmt.Errorf("0x%02X is not Encryption Response", p.ID)
 	}
 
diff --git a/server/login.go b/server/login.go
index a38735c..3b15405 100644
--- a/server/login.go
+++ b/server/login.go
@@ -96,8 +96,8 @@ func (d *MojangLoginHandler) AcceptLogin(conn *net.Conn, protocol int32) (name s
 	if err != nil {
 		return
 	}
-	if packetid.ServerboundPacketID(p.ID) != packetid.ServerboundLoginStart {
-		err = wrongPacketErr{expect: int32(packetid.ServerboundLoginStart), get: p.ID}
+	if packetid.ServerboundPacketID(p.ID) != packetid.ServerboundLoginHello {
+		err = wrongPacketErr{expect: int32(packetid.ServerboundLoginHello), get: p.ID}
 		return
 	}
 
@@ -133,7 +133,7 @@ func (d *MojangLoginHandler) AcceptLogin(conn *net.Conn, protocol int32) (name s
 	// set compression
 	if d.Threshold >= 0 {
 		err = conn.WritePacket(pk.Marshal(
-			packetid.ClientboundLoginCompression,
+			packetid.ClientboundLoginLoginCompression,
 			pk.VarInt(d.Threshold),
 		))
 		if err != nil {
@@ -152,7 +152,7 @@ func (d *MojangLoginHandler) AcceptLogin(conn *net.Conn, protocol int32) (name s
 	}
 	// send login success
 	err = conn.WritePacket(pk.Marshal(
-		packetid.ClientboundLoginSuccess,
+		packetid.ClientboundLoginGameProfile,
 		pk.UUID(id),
 		pk.String(name),
 		pk.Array(properties),
@@ -163,8 +163,8 @@ func (d *MojangLoginHandler) AcceptLogin(conn *net.Conn, protocol int32) (name s
 
 	// receive login ack
 	err = conn.ReadPacket(&p)
-	if err == nil && packetid.ServerboundPacketID(p.ID) != packetid.ServerboundLoginAcknowledged {
-		err = wrongPacketErr{expect: int32(packetid.ServerboundLoginAcknowledged), get: p.ID}
+	if err == nil && packetid.ServerboundPacketID(p.ID) != packetid.ServerboundLoginLoginAcknowledged {
+		err = wrongPacketErr{expect: int32(packetid.ServerboundLoginLoginAcknowledged), get: p.ID}
 	}
 	return
 }
diff --git a/server/ping.go b/server/ping.go
index e3d5d4a..9a67957 100644
--- a/server/ping.go
+++ b/server/ping.go
@@ -60,7 +60,7 @@ func (s *Server) acceptListPing(conn *net.Conn, clientProtocol int32) {
 		}
 
 		switch packetid.ClientboundPacketID(p.ID) {
-		case packetid.ClientboundStatusResponse: // List
+		case packetid.ClientboundStatusStatusResponse: // List
 			var resp []byte
 			resp, err = s.listResp(clientProtocol)
 			if err != nil {
diff --git a/server/server.go b/server/server.go
index 345c83f..f470ec0 100644
--- a/server/server.go
+++ b/server/server.go
@@ -81,7 +81,7 @@ func (s *Server) AcceptConn(conn *net.Conn) {
 			var loginErr LoginFailErr
 			if errors.As(err, &loginErr) {
 				_ = conn.WritePacket(pk.Marshal(
-					packetid.ClientboundLoginDisconnect,
+					packetid.ClientboundLoginLoginDisconnect,
 					loginErr.reason,
 				))
 			}