diff --git a/codec_self.go b/codec_self.go
index 1cb1be1..37c60ea 100644
--- a/codec_self.go
+++ b/codec_self.go
@@ -26,12 +26,12 @@ func (_ selfCodecType) NewStreamCodec(r *bufio.Reader, w *bufio.Writer) StreamCo
 	}
 }
 
-type SelfDecode interface {
-	BinaryDecode(*binary.Reader) error
+type SelfDecoder interface {
+	SelfDecode(*binary.Reader) error
 }
 
-type SelfEncode interface {
-	BinaryEncode(*binary.Writer) error
+type SelfEncoder interface {
+	SelfEncode(*binary.Writer) error
 }
 
 type selfPacketCodec struct {
@@ -43,12 +43,12 @@ type selfPacketCodec struct {
 
 func (codec *selfPacketCodec) DecodePacket(msg interface{}, b []byte) error {
 	codec.rbuf.Reset(b)
-	return msg.(SelfDecode).BinaryDecode(codec.r)
+	return msg.(SelfDecoder).SelfDecode(codec.r)
 }
 
 func (codec *selfPacketCodec) EncodePacket(msg interface{}) ([]byte, error) {
 	codec.wbuf.Reset(codec.wbuf.Data[0:0])
-	if err := msg.(SelfEncode).BinaryEncode(codec.w); err != nil {
+	if err := msg.(SelfEncoder).SelfEncode(codec.w); err != nil {
 		return nil, err
 	}
 	return codec.wbuf.Bytes(), nil
@@ -60,14 +60,14 @@ type selfStreamCodec struct {
 }
 
 func (codec selfStreamCodec) DecodeStream(msg interface{}) error {
-	if err := msg.(SelfDecode).BinaryDecode(codec.r); err != nil {
+	if err := msg.(SelfDecoder).SelfDecode(codec.r); err != nil {
 		return err
 	}
 	return codec.r.Error()
 }
 
 func (codec selfStreamCodec) EncodeStream(msg interface{}) error {
-	if err := msg.(SelfEncode).BinaryEncode(codec.w); err != nil {
+	if err := msg.(SelfEncoder).SelfEncode(codec.w); err != nil {
 		return err
 	}
 	return codec.w.Flush()
diff --git a/gateway/message.go b/gateway/message.go
index 221f171..f48539e 100644
--- a/gateway/message.go
+++ b/gateway/message.go
@@ -15,8 +15,8 @@ const (
 	CMD_PONG  = 7
 )
 
-var _ link.SelfEncode = &gatewayMsg{}
-var _ link.SelfDecode = &gatewayMsg{}
+var _ link.SelfEncoder = &gatewayMsg{}
+var _ link.SelfDecoder = &gatewayMsg{}
 
 type gatewayMsg struct {
 	Command   uint8
@@ -25,7 +25,7 @@ type gatewayMsg struct {
 	Data      []byte
 }
 
-func (msg *gatewayMsg) BinaryDecode(r *binary.Reader) error {
+func (msg *gatewayMsg) SelfDecode(r *binary.Reader) error {
 	msg.Command = r.ReadUint8()
 	switch msg.Command {
 	case CMD_NEW_1:
@@ -50,7 +50,7 @@ func (msg *gatewayMsg) BinaryDecode(r *binary.Reader) error {
 	return nil
 }
 
-func (msg *gatewayMsg) BinaryEncode(w *binary.Writer) error {
+func (msg *gatewayMsg) SelfEncode(w *binary.Writer) error {
 	w.WriteUint8(msg.Command)
 	switch msg.Command {
 	case CMD_NEW_1:
diff --git a/session_test.go b/session_test.go
index bf87fed..b12401a 100644
--- a/session_test.go
+++ b/session_test.go
@@ -29,14 +29,14 @@ type TestObject struct {
 	X, Y, Z int
 }
 
-func (obj *TestObject) BinaryDecode(r *binary.Reader) error {
+func (obj *TestObject) SelfDecode(r *binary.Reader) error {
 	obj.X = int(r.ReadVarint())
 	obj.Y = int(r.ReadVarint())
 	obj.Z = int(r.ReadVarint())
 	return nil
 }
 
-func (obj *TestObject) BinaryEncode(w *binary.Writer) error {
+func (obj *TestObject) SelfEncode(w *binary.Writer) error {
 	w.WriteVarint(int64(obj.X))
 	w.WriteVarint(int64(obj.Y))
 	w.WriteVarint(int64(obj.Z))