diff --git a/app/tun/handler_tcp.go b/app/tun/handler_tcp.go
index 53db9eaa3..392e42441 100644
--- a/app/tun/handler_tcp.go
+++ b/app/tun/handler_tcp.go
@@ -55,12 +55,12 @@ func HandleTCP(handle func(tun_net.TCPConn)) StackOption {
 
 			// TODO: set sockopt
 
-			tcpConn := &tcpConn{
+			conn := &tcpConn{
 				TCPConn: gonet.NewTCPConn(wg, linkedEndpoint),
 				id:      r.ID(),
 			}
 
-			tcpQueue <- tcpConn
+			handle(conn)
 		})
 		s.SetTransportProtocolHandler(tcp.ProtocolNumber, tcpForwarder.HandlePacket)
 
diff --git a/app/tun/handler_udp.go b/app/tun/handler_udp.go
index 5dffb0143..9d8518250 100644
--- a/app/tun/handler_udp.go
+++ b/app/tun/handler_udp.go
@@ -46,12 +46,12 @@ func HandleUDP(handle func(tun_net.UDPConn)) StackOption {
 				return
 			}
 
-			udpConn := &udpConn{
+			conn := &udpConn{
 				UDPConn: gonet.NewUDPConn(s, wg, linkedEndpoint),
 				id:      r.ID(),
 			}
 
-			handle(udpConn)
+			handle(conn)
 		})
 		s.SetTransportProtocolHandler(gvisor_udp.ProtocolNumber, udpForwarder.HandlePacket)
 		return nil
diff --git a/app/tun/nic.go b/app/tun/nic.go
index 8bb1cb9b7..563c43457 100644
--- a/app/tun/nic.go
+++ b/app/tun/nic.go
@@ -42,21 +42,21 @@ func SetSpoofing(id tcpip.NICID, enable bool) StackOption {
 func AddProtocolAddress(id tcpip.NICID, ips []*routercommon.CIDR) StackOption {
 	return func(s *stack.Stack) error {
 		for _, ip := range ips {
-			tcpIpAddr := tcpip.AddrFrom4Slice(ip.Ip)
+			tcpIPAddr := tcpip.AddrFrom4Slice(ip.Ip)
 			protocolAddress := tcpip.ProtocolAddress{
 				AddressWithPrefix: tcpip.AddressWithPrefix{
-					Address:   tcpIpAddr,
+					Address:   tcpIPAddr,
 					PrefixLen: int(ip.Prefix),
 				},
 			}
 
-			switch tcpIpAddr.Len() {
+			switch tcpIPAddr.Len() {
 			case 4:
 				protocolAddress.Protocol = ipv4.ProtocolNumber
 			case 16:
 				protocolAddress.Protocol = ipv6.ProtocolNumber
 			default:
-				return newError("invalid IP address length:", tcpIpAddr.Len())
+				return newError("invalid IP address length:", tcpIPAddr.Len())
 			}
 
 			if err := s.AddProtocolAddress(id, protocolAddress, stack.AddressProperties{}); err != nil {