diff --git a/candidate_base.go b/candidate_base.go
index 94e330e..9f403e3 100644
--- a/candidate_base.go
+++ b/candidate_base.go
@@ -484,7 +484,7 @@ func UnmarshalCandidate(raw string) (Candidate, error) {
 			relatedPort = int(rawRelatedPort)
 		} else if split[0] == "tcptype" {
 			if len(split) < 2 {
-				return nil, fmt.Errorf("%w: incorrect length", errParseTypType)
+				return nil, fmt.Errorf("%w: incorrect length", errParseTCPType)
 			}
 
 			tcpType = NewTCPType(split[1])
diff --git a/errors.go b/errors.go
index dbda8bd..647b2be 100644
--- a/errors.go
+++ b/errors.go
@@ -118,7 +118,7 @@ var (
 	errParsePriority                 = errors.New("could not parse priority")
 	errParsePort                     = errors.New("could not parse port")
 	errParseRelatedAddr              = errors.New("could not parse related addresses")
-	errParseTypType                  = errors.New("could not parse typtype")
+	errParseTCPType                  = errors.New("could not parse TCP type")
 	errGetXorMappedAddrResponse      = errors.New("failed to get XOR-MAPPED-ADDRESS response")
 	errConnectionAddrAlreadyExist    = errors.New("connection with same remote address already exists")
 	errReadingStreamingPacket        = errors.New("error reading streaming packet")
diff --git a/tcp_mux_multi_test.go b/tcp_mux_multi_test.go
index 4feddc5..f521a3b 100644
--- a/tcp_mux_multi_test.go
+++ b/tcp_mux_multi_test.go
@@ -16,11 +16,11 @@ import (
 )
 
 func TestMultiTCPMux_Recv(t *testing.T) {
-	for name, buffersize := range map[string]int{
+	for name, bufSize := range map[string]int{
 		"no buffer":    0,
 		"buffered 4MB": 4 * 1024 * 1024,
 	} {
-		bufSize := buffersize
+		bufSize := bufSize
 		t.Run(name, func(t *testing.T) {
 			report := test.CheckRoutines(t)
 			defer report()
diff --git a/tcp_mux_test.go b/tcp_mux_test.go
index 3ec36fb..047748c 100644
--- a/tcp_mux_test.go
+++ b/tcp_mux_test.go
@@ -18,11 +18,11 @@ var (
 )
 
 func TestTCPMux_Recv(t *testing.T) {
-	for name, buffersize := range map[string]int{
+	for name, bufSize := range map[string]int{
 		"no buffer":    0,
 		"buffered 4MB": 4 * 1024 * 1024,
 	} {
-		bufSize := buffersize
+		bufSize := bufSize
 		t.Run(name, func(t *testing.T) {
 			report := test.CheckRoutines(t)
 			defer report()
diff --git a/transport_test.go b/transport_test.go
index 90c90c4..199f88f 100644
--- a/transport_test.go
+++ b/transport_test.go
@@ -27,9 +27,9 @@ func TestStressDuplex(t *testing.T) {
 }
 
 func testTimeout(t *testing.T, c *Conn, timeout time.Duration) {
-	const pollrate = 100 * time.Millisecond
+	const pollRate = 100 * time.Millisecond
 	const margin = 20 * time.Millisecond // allow 20msec error in time
-	ticker := time.NewTicker(pollrate)
+	ticker := time.NewTicker(pollRate)
 	defer func() {
 		ticker.Stop()
 		err := c.Close()
@@ -40,7 +40,7 @@ func testTimeout(t *testing.T, c *Conn, timeout time.Duration) {
 
 	startedAt := time.Now()
 
-	for cnt := time.Duration(0); cnt <= timeout+defaultKeepaliveInterval+pollrate; cnt += pollrate {
+	for cnt := time.Duration(0); cnt <= timeout+defaultKeepaliveInterval+pollRate; cnt += pollRate {
 		<-ticker.C
 
 		var cs ConnectionState
diff --git a/udp_muxed_conn.go b/udp_muxed_conn.go
index 6775ea1..ee33001 100644
--- a/udp_muxed_conn.go
+++ b/udp_muxed_conn.go
@@ -200,18 +200,18 @@ func (c *udpMuxedConn) writePacket(data []byte, addr *net.UDPAddr) error {
 }
 
 func encodeUDPAddr(addr *net.UDPAddr, buf []byte) (int, error) {
-	ipdata, err := addr.IP.MarshalText()
+	ipData, err := addr.IP.MarshalText()
 	if err != nil {
 		return 0, err
 	}
-	total := 2 + len(ipdata) + 2 + len(addr.Zone)
+	total := 2 + len(ipData) + 2 + len(addr.Zone)
 	if total > len(buf) {
 		return 0, io.ErrShortBuffer
 	}
 
-	binary.LittleEndian.PutUint16(buf, uint16(len(ipdata)))
+	binary.LittleEndian.PutUint16(buf, uint16(len(ipData)))
 	offset := 2
-	n := copy(buf[offset:], ipdata)
+	n := copy(buf[offset:], ipData)
 	offset += n
 	binary.LittleEndian.PutUint16(buf[offset:], uint16(addr.Port))
 	offset += 2
diff --git a/util.go b/util.go
index 011fd8c..434e9e8 100644
--- a/util.go
+++ b/util.go
@@ -94,8 +94,8 @@ func getXORMappedAddr(conn net.PacketConn, serverAddr net.Addr, deadline time.Du
 	}()
 	resp, err := stunRequest(
 		func(p []byte) (int, error) {
-			n, _, errr := conn.ReadFrom(p)
-			return n, errr
+			n, _, err := conn.ReadFrom(p)
+			return n, err
 		},
 		func(b []byte) (int, error) {
 			return conn.WriteTo(b, serverAddr)