diff --git a/router/crypto.go b/router/crypto.go
index 095c344b..0ca7f846 100644
--- a/router/crypto.go
+++ b/router/crypto.go
@@ -332,7 +332,7 @@ type TCPSender interface {
 	Send([]byte) error
 }
 
-type SimpleTCPSender struct {
+type GobTCPSender struct {
 	encoder *gob.Encoder
 }
 
@@ -342,11 +342,11 @@ type EncryptedTCPSender struct {
 	state  *TCPCryptoState
 }
 
-func NewSimpleTCPSender(encoder *gob.Encoder) *SimpleTCPSender {
-	return &SimpleTCPSender{encoder: encoder}
+func NewGobTCPSender(encoder *gob.Encoder) *GobTCPSender {
+	return &GobTCPSender{encoder: encoder}
 }
 
-func (sender *SimpleTCPSender) Send(msg []byte) error {
+func (sender *GobTCPSender) Send(msg []byte) error {
 	return sender.encoder.Encode(msg)
 }
 
@@ -366,7 +366,7 @@ type TCPReceiver interface {
 	Receive() ([]byte, error)
 }
 
-type SimpleTCPReceiver struct {
+type GobTCPReceiver struct {
 	decoder *gob.Decoder
 }
 
@@ -375,11 +375,11 @@ type EncryptedTCPReceiver struct {
 	state    *TCPCryptoState
 }
 
-func NewSimpleTCPReceiver(decoder *gob.Decoder) *SimpleTCPReceiver {
-	return &SimpleTCPReceiver{decoder: decoder}
+func NewGobTCPReceiver(decoder *gob.Decoder) *GobTCPReceiver {
+	return &GobTCPReceiver{decoder: decoder}
 }
 
-func (receiver *SimpleTCPReceiver) Receive() ([]byte, error) {
+func (receiver *GobTCPReceiver) Receive() ([]byte, error) {
 	var msg []byte
 	err := receiver.decoder.Decode(&msg)
 	return msg, err
diff --git a/router/protocol.go b/router/protocol.go
index 65f25089..500d0d61 100644
--- a/router/protocol.go
+++ b/router/protocol.go
@@ -180,8 +180,8 @@ func (res *ProtocolIntroResults) doIntroV1(params ProtocolIntroParams, pubKey, p
 		return err
 	}
 
-	res.Sender = NewSimpleTCPSender(enc)
-	res.Receiver = NewSimpleTCPReceiver(dec)
+	res.Sender = NewGobTCPSender(enc)
+	res.Receiver = NewGobTCPReceiver(dec)
 
 	if pubKey == nil {
 		if _, present := res.Features["PublicKey"]; present {
@@ -266,8 +266,8 @@ func (res *ProtocolIntroResults) doIntroV2(params ProtocolIntroParams, pubKey, p
 			return ErrExpectedCrypto
 		}
 
-		res.Sender = NewSimpleTCPSender(gob.NewEncoder(params.Conn))
-		res.Receiver = NewSimpleTCPReceiver(gob.NewDecoder(params.Conn))
+		res.Sender = NewGobTCPSender(gob.NewEncoder(params.Conn))
+		res.Receiver = NewGobTCPReceiver(gob.NewDecoder(params.Conn))
 
 	case 1:
 		if pubKey == nil {
@@ -279,8 +279,8 @@ func (res *ProtocolIntroResults) doIntroV2(params ProtocolIntroParams, pubKey, p
 			return err
 		}
 
-		res.Sender = NewSimpleTCPSender(gob.NewEncoder(params.Conn))
-		res.Receiver = NewSimpleTCPReceiver(gob.NewDecoder(params.Conn))
+		res.Sender = NewGobTCPSender(gob.NewEncoder(params.Conn))
+		res.Receiver = NewGobTCPReceiver(gob.NewDecoder(params.Conn))
 		res.setupCrypto(params, rbuf, privKey)
 
 	default: