diff --git a/ipv6/bpfopt_linux.go b/ipv6/bpfopt_linux.go
index 328427cb..daf7ea85 100644
--- a/ipv6/bpfopt_linux.go
+++ b/ipv6/bpfopt_linux.go
@@ -20,9 +20,9 @@ func (c *dgramOpt) SetBPF(filter []bpf.RawInstruction) error {
 	if err != nil {
 		return err
 	}
-	prog := sysSockFProg{
+	prog := sockFProg{
 		Len:    uint16(len(filter)),
-		Filter: (*sysSockFilter)(unsafe.Pointer(&filter[0])),
+		Filter: (*sockFilter)(unsafe.Pointer(&filter[0])),
 	}
 	return os.NewSyscallError("setsockopt", setsockopt(s, sysSOL_SOCKET, sysSO_ATTACH_FILTER, unsafe.Pointer(&prog), uint32(unsafe.Sizeof(prog))))
 }
diff --git a/ipv6/control_rfc2292_unix.go b/ipv6/control_rfc2292_unix.go
index 80ec2e2f..178aa532 100644
--- a/ipv6/control_rfc2292_unix.go
+++ b/ipv6/control_rfc2292_unix.go
@@ -29,9 +29,9 @@ func marshal2292PacketInfo(b []byte, cm *ControlMessage) []byte {
 	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
 	m.Level = iana.ProtocolIPv6
 	m.Type = sysIPV6_2292PKTINFO
-	m.SetLen(syscall.CmsgLen(sysSizeofInet6Pktinfo))
+	m.SetLen(syscall.CmsgLen(sizeofInet6Pktinfo))
 	if cm != nil {
-		pi := (*sysInet6Pktinfo)(unsafe.Pointer(&b[syscall.CmsgLen(0)]))
+		pi := (*inet6Pktinfo)(unsafe.Pointer(&b[syscall.CmsgLen(0)]))
 		if ip := cm.Src.To16(); ip != nil && ip.To4() == nil {
 			copy(pi.Addr[:], ip)
 		}
@@ -39,17 +39,17 @@ func marshal2292PacketInfo(b []byte, cm *ControlMessage) []byte {
 			pi.setIfindex(cm.IfIndex)
 		}
 	}
-	return b[syscall.CmsgSpace(sysSizeofInet6Pktinfo):]
+	return b[syscall.CmsgSpace(sizeofInet6Pktinfo):]
 }
 
 func marshal2292NextHop(b []byte, cm *ControlMessage) []byte {
 	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
 	m.Level = iana.ProtocolIPv6
 	m.Type = sysIPV6_2292NEXTHOP
-	m.SetLen(syscall.CmsgLen(sysSizeofSockaddrInet6))
+	m.SetLen(syscall.CmsgLen(sizeofSockaddrInet6))
 	if cm != nil {
-		sa := (*sysSockaddrInet6)(unsafe.Pointer(&b[syscall.CmsgLen(0)]))
+		sa := (*sockaddrInet6)(unsafe.Pointer(&b[syscall.CmsgLen(0)]))
 		sa.setSockaddr(cm.NextHop, cm.IfIndex)
 	}
-	return b[syscall.CmsgSpace(sysSizeofSockaddrInet6):]
+	return b[syscall.CmsgSpace(sizeofSockaddrInet6):]
 }
diff --git a/ipv6/control_rfc3542_unix.go b/ipv6/control_rfc3542_unix.go
index abbbd77b..46127ab0 100644
--- a/ipv6/control_rfc3542_unix.go
+++ b/ipv6/control_rfc3542_unix.go
@@ -49,9 +49,9 @@ func marshalPacketInfo(b []byte, cm *ControlMessage) []byte {
 	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
 	m.Level = iana.ProtocolIPv6
 	m.Type = sysIPV6_PKTINFO
-	m.SetLen(syscall.CmsgLen(sysSizeofInet6Pktinfo))
+	m.SetLen(syscall.CmsgLen(sizeofInet6Pktinfo))
 	if cm != nil {
-		pi := (*sysInet6Pktinfo)(unsafe.Pointer(&b[syscall.CmsgLen(0)]))
+		pi := (*inet6Pktinfo)(unsafe.Pointer(&b[syscall.CmsgLen(0)]))
 		if ip := cm.Src.To16(); ip != nil && ip.To4() == nil {
 			copy(pi.Addr[:], ip)
 		}
@@ -59,11 +59,11 @@ func marshalPacketInfo(b []byte, cm *ControlMessage) []byte {
 			pi.setIfindex(cm.IfIndex)
 		}
 	}
-	return b[syscall.CmsgSpace(sysSizeofInet6Pktinfo):]
+	return b[syscall.CmsgSpace(sizeofInet6Pktinfo):]
 }
 
 func parsePacketInfo(cm *ControlMessage, b []byte) {
-	pi := (*sysInet6Pktinfo)(unsafe.Pointer(&b[0]))
+	pi := (*inet6Pktinfo)(unsafe.Pointer(&b[0]))
 	cm.Dst = pi.Addr[:]
 	cm.IfIndex = int(pi.Ifindex)
 }
@@ -72,12 +72,12 @@ func marshalNextHop(b []byte, cm *ControlMessage) []byte {
 	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
 	m.Level = iana.ProtocolIPv6
 	m.Type = sysIPV6_NEXTHOP
-	m.SetLen(syscall.CmsgLen(sysSizeofSockaddrInet6))
+	m.SetLen(syscall.CmsgLen(sizeofSockaddrInet6))
 	if cm != nil {
-		sa := (*sysSockaddrInet6)(unsafe.Pointer(&b[syscall.CmsgLen(0)]))
+		sa := (*sockaddrInet6)(unsafe.Pointer(&b[syscall.CmsgLen(0)]))
 		sa.setSockaddr(cm.NextHop, cm.IfIndex)
 	}
-	return b[syscall.CmsgSpace(sysSizeofSockaddrInet6):]
+	return b[syscall.CmsgSpace(sizeofSockaddrInet6):]
 }
 
 func parseNextHop(cm *ControlMessage, b []byte) {
@@ -87,12 +87,12 @@ func marshalPathMTU(b []byte, cm *ControlMessage) []byte {
 	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
 	m.Level = iana.ProtocolIPv6
 	m.Type = sysIPV6_PATHMTU
-	m.SetLen(syscall.CmsgLen(sysSizeofIPv6Mtuinfo))
-	return b[syscall.CmsgSpace(sysSizeofIPv6Mtuinfo):]
+	m.SetLen(syscall.CmsgLen(sizeofIPv6Mtuinfo))
+	return b[syscall.CmsgSpace(sizeofIPv6Mtuinfo):]
 }
 
 func parsePathMTU(cm *ControlMessage, b []byte) {
-	mi := (*sysIPv6Mtuinfo)(unsafe.Pointer(&b[0]))
+	mi := (*ipv6Mtuinfo)(unsafe.Pointer(&b[0]))
 	cm.Dst = mi.Addr.Addr[:]
 	cm.IfIndex = int(mi.Addr.Scope_id)
 	cm.MTU = int(mi.Mtu)
diff --git a/ipv6/defs_darwin.go b/ipv6/defs_darwin.go
index 4c7f476a..55ddc116 100644
--- a/ipv6/defs_darwin.go
+++ b/ipv6/defs_darwin.go
@@ -83,30 +83,30 @@ const (
 	sysIPV6_PORTRANGE_HIGH    = C.IPV6_PORTRANGE_HIGH
 	sysIPV6_PORTRANGE_LOW     = C.IPV6_PORTRANGE_LOW
 
-	sysSizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
-	sysSizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
-	sysSizeofInet6Pktinfo    = C.sizeof_struct_in6_pktinfo
-	sysSizeofIPv6Mtuinfo     = C.sizeof_struct_ip6_mtuinfo
+	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
+	sizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
+	sizeofInet6Pktinfo    = C.sizeof_struct_in6_pktinfo
+	sizeofIPv6Mtuinfo     = C.sizeof_struct_ip6_mtuinfo
 
-	sysSizeofIPv6Mreq       = C.sizeof_struct_ipv6_mreq
-	sysSizeofGroupReq       = C.sizeof_struct_group_req
-	sysSizeofGroupSourceReq = C.sizeof_struct_group_source_req
+	sizeofIPv6Mreq       = C.sizeof_struct_ipv6_mreq
+	sizeofGroupReq       = C.sizeof_struct_group_req
+	sizeofGroupSourceReq = C.sizeof_struct_group_source_req
 
-	sysSizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
+	sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
 )
 
-type sysSockaddrStorage C.struct_sockaddr_storage
+type sockaddrStorage C.struct_sockaddr_storage
 
-type sysSockaddrInet6 C.struct_sockaddr_in6
+type sockaddrInet6 C.struct_sockaddr_in6
 
-type sysInet6Pktinfo C.struct_in6_pktinfo
+type inet6Pktinfo C.struct_in6_pktinfo
 
-type sysIPv6Mtuinfo C.struct_ip6_mtuinfo
+type ipv6Mtuinfo C.struct_ip6_mtuinfo
 
-type sysIPv6Mreq C.struct_ipv6_mreq
+type ipv6Mreq C.struct_ipv6_mreq
 
-type sysICMPv6Filter C.struct_icmp6_filter
+type icmpv6Filter C.struct_icmp6_filter
 
-type sysGroupReq C.struct_group_req
+type groupReq C.struct_group_req
 
-type sysGroupSourceReq C.struct_group_source_req
+type groupSourceReq C.struct_group_source_req
diff --git a/ipv6/defs_dragonfly.go b/ipv6/defs_dragonfly.go
index c72487ce..a4c383a5 100644
--- a/ipv6/defs_dragonfly.go
+++ b/ipv6/defs_dragonfly.go
@@ -64,21 +64,21 @@ const (
 	sysIPV6_PORTRANGE_HIGH    = C.IPV6_PORTRANGE_HIGH
 	sysIPV6_PORTRANGE_LOW     = C.IPV6_PORTRANGE_LOW
 
-	sysSizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6
-	sysSizeofInet6Pktinfo  = C.sizeof_struct_in6_pktinfo
-	sysSizeofIPv6Mtuinfo   = C.sizeof_struct_ip6_mtuinfo
+	sizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6
+	sizeofInet6Pktinfo  = C.sizeof_struct_in6_pktinfo
+	sizeofIPv6Mtuinfo   = C.sizeof_struct_ip6_mtuinfo
 
-	sysSizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq
+	sizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq
 
-	sysSizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
+	sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
 )
 
-type sysSockaddrInet6 C.struct_sockaddr_in6
+type sockaddrInet6 C.struct_sockaddr_in6
 
-type sysInet6Pktinfo C.struct_in6_pktinfo
+type inet6Pktinfo C.struct_in6_pktinfo
 
-type sysIPv6Mtuinfo C.struct_ip6_mtuinfo
+type ipv6Mtuinfo C.struct_ip6_mtuinfo
 
-type sysIPv6Mreq C.struct_ipv6_mreq
+type ipv6Mreq C.struct_ipv6_mreq
 
-type sysICMPv6Filter C.struct_icmp6_filter
+type icmpv6Filter C.struct_icmp6_filter
diff --git a/ipv6/defs_freebsd.go b/ipv6/defs_freebsd.go
index de199ec6..53e62538 100644
--- a/ipv6/defs_freebsd.go
+++ b/ipv6/defs_freebsd.go
@@ -76,30 +76,30 @@ const (
 	sysIPV6_PORTRANGE_HIGH    = C.IPV6_PORTRANGE_HIGH
 	sysIPV6_PORTRANGE_LOW     = C.IPV6_PORTRANGE_LOW
 
-	sysSizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
-	sysSizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
-	sysSizeofInet6Pktinfo    = C.sizeof_struct_in6_pktinfo
-	sysSizeofIPv6Mtuinfo     = C.sizeof_struct_ip6_mtuinfo
+	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
+	sizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
+	sizeofInet6Pktinfo    = C.sizeof_struct_in6_pktinfo
+	sizeofIPv6Mtuinfo     = C.sizeof_struct_ip6_mtuinfo
 
-	sysSizeofIPv6Mreq       = C.sizeof_struct_ipv6_mreq
-	sysSizeofGroupReq       = C.sizeof_struct_group_req
-	sysSizeofGroupSourceReq = C.sizeof_struct_group_source_req
+	sizeofIPv6Mreq       = C.sizeof_struct_ipv6_mreq
+	sizeofGroupReq       = C.sizeof_struct_group_req
+	sizeofGroupSourceReq = C.sizeof_struct_group_source_req
 
-	sysSizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
+	sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
 )
 
-type sysSockaddrStorage C.struct_sockaddr_storage
+type sockaddrStorage C.struct_sockaddr_storage
 
-type sysSockaddrInet6 C.struct_sockaddr_in6
+type sockaddrInet6 C.struct_sockaddr_in6
 
-type sysInet6Pktinfo C.struct_in6_pktinfo
+type inet6Pktinfo C.struct_in6_pktinfo
 
-type sysIPv6Mtuinfo C.struct_ip6_mtuinfo
+type ipv6Mtuinfo C.struct_ip6_mtuinfo
 
-type sysIPv6Mreq C.struct_ipv6_mreq
+type ipv6Mreq C.struct_ipv6_mreq
 
-type sysGroupReq C.struct_group_req
+type groupReq C.struct_group_req
 
-type sysGroupSourceReq C.struct_group_source_req
+type groupSourceReq C.struct_group_source_req
 
-type sysICMPv6Filter C.struct_icmp6_filter
+type icmpv6Filter C.struct_icmp6_filter
diff --git a/ipv6/defs_linux.go b/ipv6/defs_linux.go
index 664305d8..8a967fd2 100644
--- a/ipv6/defs_linux.go
+++ b/ipv6/defs_linux.go
@@ -109,37 +109,37 @@ const (
 	sysSOL_SOCKET       = C.SOL_SOCKET
 	sysSO_ATTACH_FILTER = C.SO_ATTACH_FILTER
 
-	sysSizeofKernelSockaddrStorage = C.sizeof_struct___kernel_sockaddr_storage
-	sysSizeofSockaddrInet6         = C.sizeof_struct_sockaddr_in6
-	sysSizeofInet6Pktinfo          = C.sizeof_struct_in6_pktinfo
-	sysSizeofIPv6Mtuinfo           = C.sizeof_struct_ip6_mtuinfo
-	sysSizeofIPv6FlowlabelReq      = C.sizeof_struct_in6_flowlabel_req
+	sizeofKernelSockaddrStorage = C.sizeof_struct___kernel_sockaddr_storage
+	sizeofSockaddrInet6         = C.sizeof_struct_sockaddr_in6
+	sizeofInet6Pktinfo          = C.sizeof_struct_in6_pktinfo
+	sizeofIPv6Mtuinfo           = C.sizeof_struct_ip6_mtuinfo
+	sizeofIPv6FlowlabelReq      = C.sizeof_struct_in6_flowlabel_req
 
-	sysSizeofIPv6Mreq       = C.sizeof_struct_ipv6_mreq
-	sysSizeofGroupReq       = C.sizeof_struct_group_req
-	sysSizeofGroupSourceReq = C.sizeof_struct_group_source_req
+	sizeofIPv6Mreq       = C.sizeof_struct_ipv6_mreq
+	sizeofGroupReq       = C.sizeof_struct_group_req
+	sizeofGroupSourceReq = C.sizeof_struct_group_source_req
 
-	sysSizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
+	sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
 )
 
-type sysKernelSockaddrStorage C.struct___kernel_sockaddr_storage
+type kernelSockaddrStorage C.struct___kernel_sockaddr_storage
 
-type sysSockaddrInet6 C.struct_sockaddr_in6
+type sockaddrInet6 C.struct_sockaddr_in6
 
-type sysInet6Pktinfo C.struct_in6_pktinfo
+type inet6Pktinfo C.struct_in6_pktinfo
 
-type sysIPv6Mtuinfo C.struct_ip6_mtuinfo
+type ipv6Mtuinfo C.struct_ip6_mtuinfo
 
-type sysIPv6FlowlabelReq C.struct_in6_flowlabel_req
+type ipv6FlowlabelReq C.struct_in6_flowlabel_req
 
-type sysIPv6Mreq C.struct_ipv6_mreq
+type ipv6Mreq C.struct_ipv6_mreq
 
-type sysGroupReq C.struct_group_req
+type groupReq C.struct_group_req
 
-type sysGroupSourceReq C.struct_group_source_req
+type groupSourceReq C.struct_group_source_req
 
-type sysICMPv6Filter C.struct_icmp6_filter
+type icmpv6Filter C.struct_icmp6_filter
 
-type sysSockFProg C.struct_sock_fprog
+type sockFProg C.struct_sock_fprog
 
-type sysSockFilter C.struct_sock_filter
+type sockFilter C.struct_sock_filter
diff --git a/ipv6/defs_netbsd.go b/ipv6/defs_netbsd.go
index 7bd09e8e..be9ceb9c 100644
--- a/ipv6/defs_netbsd.go
+++ b/ipv6/defs_netbsd.go
@@ -60,21 +60,21 @@ const (
 	sysIPV6_PORTRANGE_HIGH    = C.IPV6_PORTRANGE_HIGH
 	sysIPV6_PORTRANGE_LOW     = C.IPV6_PORTRANGE_LOW
 
-	sysSizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6
-	sysSizeofInet6Pktinfo  = C.sizeof_struct_in6_pktinfo
-	sysSizeofIPv6Mtuinfo   = C.sizeof_struct_ip6_mtuinfo
+	sizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6
+	sizeofInet6Pktinfo  = C.sizeof_struct_in6_pktinfo
+	sizeofIPv6Mtuinfo   = C.sizeof_struct_ip6_mtuinfo
 
-	sysSizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq
+	sizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq
 
-	sysSizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
+	sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
 )
 
-type sysSockaddrInet6 C.struct_sockaddr_in6
+type sockaddrInet6 C.struct_sockaddr_in6
 
-type sysInet6Pktinfo C.struct_in6_pktinfo
+type inet6Pktinfo C.struct_in6_pktinfo
 
-type sysIPv6Mtuinfo C.struct_ip6_mtuinfo
+type ipv6Mtuinfo C.struct_ip6_mtuinfo
 
-type sysIPv6Mreq C.struct_ipv6_mreq
+type ipv6Mreq C.struct_ipv6_mreq
 
-type sysICMPv6Filter C.struct_icmp6_filter
+type icmpv6Filter C.struct_icmp6_filter
diff --git a/ipv6/defs_openbsd.go b/ipv6/defs_openbsd.go
index 6796d9b2..177ddf87 100644
--- a/ipv6/defs_openbsd.go
+++ b/ipv6/defs_openbsd.go
@@ -69,21 +69,21 @@ const (
 	sysIPV6_PORTRANGE_HIGH    = C.IPV6_PORTRANGE_HIGH
 	sysIPV6_PORTRANGE_LOW     = C.IPV6_PORTRANGE_LOW
 
-	sysSizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6
-	sysSizeofInet6Pktinfo  = C.sizeof_struct_in6_pktinfo
-	sysSizeofIPv6Mtuinfo   = C.sizeof_struct_ip6_mtuinfo
+	sizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6
+	sizeofInet6Pktinfo  = C.sizeof_struct_in6_pktinfo
+	sizeofIPv6Mtuinfo   = C.sizeof_struct_ip6_mtuinfo
 
-	sysSizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq
+	sizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq
 
-	sysSizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
+	sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
 )
 
-type sysSockaddrInet6 C.struct_sockaddr_in6
+type sockaddrInet6 C.struct_sockaddr_in6
 
-type sysInet6Pktinfo C.struct_in6_pktinfo
+type inet6Pktinfo C.struct_in6_pktinfo
 
-type sysIPv6Mtuinfo C.struct_ip6_mtuinfo
+type ipv6Mtuinfo C.struct_ip6_mtuinfo
 
-type sysIPv6Mreq C.struct_ipv6_mreq
+type ipv6Mreq C.struct_ipv6_mreq
 
-type sysICMPv6Filter C.struct_icmp6_filter
+type icmpv6Filter C.struct_icmp6_filter
diff --git a/ipv6/defs_solaris.go b/ipv6/defs_solaris.go
index 905853bb..0f8ce2b4 100644
--- a/ipv6/defs_solaris.go
+++ b/ipv6/defs_solaris.go
@@ -85,30 +85,30 @@ const (
 
 	sysICMP6_FILTER = C.ICMP6_FILTER
 
-	sysSizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
-	sysSizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
-	sysSizeofInet6Pktinfo    = C.sizeof_struct_in6_pktinfo
-	sysSizeofIPv6Mtuinfo     = C.sizeof_struct_ip6_mtuinfo
+	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
+	sizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
+	sizeofInet6Pktinfo    = C.sizeof_struct_in6_pktinfo
+	sizeofIPv6Mtuinfo     = C.sizeof_struct_ip6_mtuinfo
 
-	sysSizeofIPv6Mreq       = C.sizeof_struct_ipv6_mreq
-	sysSizeofGroupReq       = C.sizeof_struct_group_req
-	sysSizeofGroupSourceReq = C.sizeof_struct_group_source_req
+	sizeofIPv6Mreq       = C.sizeof_struct_ipv6_mreq
+	sizeofGroupReq       = C.sizeof_struct_group_req
+	sizeofGroupSourceReq = C.sizeof_struct_group_source_req
 
-	sysSizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
+	sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
 )
 
-type sysSockaddrStorage C.struct_sockaddr_storage
+type sockaddrStorage C.struct_sockaddr_storage
 
-type sysSockaddrInet6 C.struct_sockaddr_in6
+type sockaddrInet6 C.struct_sockaddr_in6
 
-type sysInet6Pktinfo C.struct_in6_pktinfo
+type inet6Pktinfo C.struct_in6_pktinfo
 
-type sysIPv6Mtuinfo C.struct_ip6_mtuinfo
+type ipv6Mtuinfo C.struct_ip6_mtuinfo
 
-type sysIPv6Mreq C.struct_ipv6_mreq
+type ipv6Mreq C.struct_ipv6_mreq
 
-type sysGroupReq C.struct_group_req
+type groupReq C.struct_group_req
 
-type sysGroupSourceReq C.struct_group_source_req
+type groupSourceReq C.struct_group_source_req
 
-type sysICMPv6Filter C.struct_icmp6_filter
+type icmpv6Filter C.struct_icmp6_filter
diff --git a/ipv6/icmp.go b/ipv6/icmp.go
index a2de65a0..62f1b4bb 100644
--- a/ipv6/icmp.go
+++ b/ipv6/icmp.go
@@ -31,7 +31,7 @@ func (typ ICMPType) Protocol() int {
 // packets not explicitly addressed to itself, and a host means a node
 // that is not a router.
 type ICMPFilter struct {
-	sysICMPv6Filter
+	icmpv6Filter
 }
 
 // Accept accepts incoming ICMP packets including the type field value
diff --git a/ipv6/icmp_bsd.go b/ipv6/icmp_bsd.go
index 30e3ce42..93bf2f8f 100644
--- a/ipv6/icmp_bsd.go
+++ b/ipv6/icmp_bsd.go
@@ -6,15 +6,15 @@
 
 package ipv6
 
-func (f *sysICMPv6Filter) accept(typ ICMPType) {
+func (f *icmpv6Filter) accept(typ ICMPType) {
 	f.Filt[typ>>5] |= 1 << (uint32(typ) & 31)
 }
 
-func (f *sysICMPv6Filter) block(typ ICMPType) {
+func (f *icmpv6Filter) block(typ ICMPType) {
 	f.Filt[typ>>5] &^= 1 << (uint32(typ) & 31)
 }
 
-func (f *sysICMPv6Filter) setAll(block bool) {
+func (f *icmpv6Filter) setAll(block bool) {
 	for i := range f.Filt {
 		if block {
 			f.Filt[i] = 0
@@ -24,6 +24,6 @@ func (f *sysICMPv6Filter) setAll(block bool) {
 	}
 }
 
-func (f *sysICMPv6Filter) willBlock(typ ICMPType) bool {
+func (f *icmpv6Filter) willBlock(typ ICMPType) bool {
 	return f.Filt[typ>>5]&(1<<(uint32(typ)&31)) == 0
 }
diff --git a/ipv6/icmp_linux.go b/ipv6/icmp_linux.go
index a67ecf69..f5948227 100644
--- a/ipv6/icmp_linux.go
+++ b/ipv6/icmp_linux.go
@@ -4,15 +4,15 @@
 
 package ipv6
 
-func (f *sysICMPv6Filter) accept(typ ICMPType) {
+func (f *icmpv6Filter) accept(typ ICMPType) {
 	f.Data[typ>>5] &^= 1 << (uint32(typ) & 31)
 }
 
-func (f *sysICMPv6Filter) block(typ ICMPType) {
+func (f *icmpv6Filter) block(typ ICMPType) {
 	f.Data[typ>>5] |= 1 << (uint32(typ) & 31)
 }
 
-func (f *sysICMPv6Filter) setAll(block bool) {
+func (f *icmpv6Filter) setAll(block bool) {
 	for i := range f.Data {
 		if block {
 			f.Data[i] = 1<<32 - 1
@@ -22,6 +22,6 @@ func (f *sysICMPv6Filter) setAll(block bool) {
 	}
 }
 
-func (f *sysICMPv6Filter) willBlock(typ ICMPType) bool {
+func (f *icmpv6Filter) willBlock(typ ICMPType) bool {
 	return f.Data[typ>>5]&(1<<(uint32(typ)&31)) != 0
 }
diff --git a/ipv6/icmp_solaris.go b/ipv6/icmp_solaris.go
index f358cc1f..0473bbc2 100644
--- a/ipv6/icmp_solaris.go
+++ b/ipv6/icmp_solaris.go
@@ -6,15 +6,15 @@
 
 package ipv6
 
-func (f *sysICMPv6Filter) accept(typ ICMPType) {
+func (f *icmpv6Filter) accept(typ ICMPType) {
 	f.X__icmp6_filt[typ>>5] |= 1 << (uint32(typ) & 31)
 }
 
-func (f *sysICMPv6Filter) block(typ ICMPType) {
+func (f *icmpv6Filter) block(typ ICMPType) {
 	f.X__icmp6_filt[typ>>5] &^= 1 << (uint32(typ) & 31)
 }
 
-func (f *sysICMPv6Filter) setAll(block bool) {
+func (f *icmpv6Filter) setAll(block bool) {
 	for i := range f.X__icmp6_filt {
 		if block {
 			f.X__icmp6_filt[i] = 0
@@ -24,6 +24,6 @@ func (f *sysICMPv6Filter) setAll(block bool) {
 	}
 }
 
-func (f *sysICMPv6Filter) willBlock(typ ICMPType) bool {
+func (f *icmpv6Filter) willBlock(typ ICMPType) bool {
 	return f.X__icmp6_filt[typ>>5]&(1<<(uint32(typ)&31)) == 0
 }
diff --git a/ipv6/icmp_stub.go b/ipv6/icmp_stub.go
index c1263eca..f89ad446 100644
--- a/ipv6/icmp_stub.go
+++ b/ipv6/icmp_stub.go
@@ -6,18 +6,18 @@
 
 package ipv6
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 }
 
-func (f *sysICMPv6Filter) accept(typ ICMPType) {
+func (f *icmpv6Filter) accept(typ ICMPType) {
 }
 
-func (f *sysICMPv6Filter) block(typ ICMPType) {
+func (f *icmpv6Filter) block(typ ICMPType) {
 }
 
-func (f *sysICMPv6Filter) setAll(block bool) {
+func (f *icmpv6Filter) setAll(block bool) {
 }
 
-func (f *sysICMPv6Filter) willBlock(typ ICMPType) bool {
+func (f *icmpv6Filter) willBlock(typ ICMPType) bool {
 	return false
 }
diff --git a/ipv6/icmp_windows.go b/ipv6/icmp_windows.go
index f477a8c0..d5a1577f 100644
--- a/ipv6/icmp_windows.go
+++ b/ipv6/icmp_windows.go
@@ -4,19 +4,19 @@
 
 package ipv6
 
-func (f *sysICMPv6Filter) accept(typ ICMPType) {
+func (f *icmpv6Filter) accept(typ ICMPType) {
 	// TODO(mikio): implement this
 }
 
-func (f *sysICMPv6Filter) block(typ ICMPType) {
+func (f *icmpv6Filter) block(typ ICMPType) {
 	// TODO(mikio): implement this
 }
 
-func (f *sysICMPv6Filter) setAll(block bool) {
+func (f *icmpv6Filter) setAll(block bool) {
 	// TODO(mikio): implement this
 }
 
-func (f *sysICMPv6Filter) willBlock(typ ICMPType) bool {
+func (f *icmpv6Filter) willBlock(typ ICMPType) bool {
 	// TODO(mikio): implement this
 	return false
 }
diff --git a/ipv6/sockopt_asmreq_posix.go b/ipv6/sockopt_asmreq_posix.go
index 512cbe52..3bdc1516 100644
--- a/ipv6/sockopt_asmreq_posix.go
+++ b/ipv6/sockopt_asmreq_posix.go
@@ -13,10 +13,10 @@ import (
 )
 
 func setsockoptIPMreq(s uintptr, opt *sockOpt, ifi *net.Interface, grp net.IP) error {
-	var mreq sysIPv6Mreq
+	var mreq ipv6Mreq
 	copy(mreq.Multiaddr[:], grp)
 	if ifi != nil {
 		mreq.setIfindex(ifi.Index)
 	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, opt.level, opt.name, unsafe.Pointer(&mreq), sysSizeofIPv6Mreq))
+	return os.NewSyscallError("setsockopt", setsockopt(s, opt.level, opt.name, unsafe.Pointer(&mreq), sizeofIPv6Mreq))
 }
diff --git a/ipv6/sockopt_posix.go b/ipv6/sockopt_posix.go
index f8259d61..927a35e1 100644
--- a/ipv6/sockopt_posix.go
+++ b/ipv6/sockopt_posix.go
@@ -67,8 +67,8 @@ func getICMPFilter(s uintptr, opt *sockOpt) (*ICMPFilter, error) {
 		return nil, errOpNoSupport
 	}
 	var f ICMPFilter
-	l := uint32(sysSizeofICMPv6Filter)
-	if err := getsockopt(s, opt.level, opt.name, unsafe.Pointer(&f.sysICMPv6Filter), &l); err != nil {
+	l := uint32(sizeofICMPv6Filter)
+	if err := getsockopt(s, opt.level, opt.name, unsafe.Pointer(&f.icmpv6Filter), &l); err != nil {
 		return nil, os.NewSyscallError("getsockopt", err)
 	}
 	return &f, nil
@@ -78,15 +78,15 @@ func setICMPFilter(s uintptr, opt *sockOpt, f *ICMPFilter) error {
 	if opt.name < 1 || opt.typ != ssoTypeICMPFilter {
 		return errOpNoSupport
 	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, opt.level, opt.name, unsafe.Pointer(&f.sysICMPv6Filter), sysSizeofICMPv6Filter))
+	return os.NewSyscallError("setsockopt", setsockopt(s, opt.level, opt.name, unsafe.Pointer(&f.icmpv6Filter), sizeofICMPv6Filter))
 }
 
 func getMTUInfo(s uintptr, opt *sockOpt) (*net.Interface, int, error) {
 	if opt.name < 1 || opt.typ != ssoTypeMTUInfo {
 		return nil, 0, errOpNoSupport
 	}
-	var mi sysIPv6Mtuinfo
-	l := uint32(sysSizeofIPv6Mtuinfo)
+	var mi ipv6Mtuinfo
+	l := uint32(sizeofIPv6Mtuinfo)
 	if err := getsockopt(s, opt.level, opt.name, unsafe.Pointer(&mi), &l); err != nil {
 		return nil, 0, os.NewSyscallError("getsockopt", err)
 	}
diff --git a/ipv6/sockopt_ssmreq_unix.go b/ipv6/sockopt_ssmreq_unix.go
index cf4dca71..f3668aef 100644
--- a/ipv6/sockopt_ssmreq_unix.go
+++ b/ipv6/sockopt_ssmreq_unix.go
@@ -15,7 +15,7 @@ import (
 var freebsd32o64 bool
 
 func setsockoptGroupReq(s uintptr, opt *sockOpt, ifi *net.Interface, grp net.IP) error {
-	var gr sysGroupReq
+	var gr groupReq
 	if ifi != nil {
 		gr.Interface = uint32(ifi.Index)
 	}
@@ -23,21 +23,21 @@ func setsockoptGroupReq(s uintptr, opt *sockOpt, ifi *net.Interface, grp net.IP)
 	var p unsafe.Pointer
 	var l uint32
 	if freebsd32o64 {
-		var d [sysSizeofGroupReq + 4]byte
-		s := (*[sysSizeofGroupReq]byte)(unsafe.Pointer(&gr))
+		var d [sizeofGroupReq + 4]byte
+		s := (*[sizeofGroupReq]byte)(unsafe.Pointer(&gr))
 		copy(d[:4], s[:4])
 		copy(d[8:], s[4:])
 		p = unsafe.Pointer(&d[0])
-		l = sysSizeofGroupReq + 4
+		l = sizeofGroupReq + 4
 	} else {
 		p = unsafe.Pointer(&gr)
-		l = sysSizeofGroupReq
+		l = sizeofGroupReq
 	}
 	return os.NewSyscallError("setsockopt", setsockopt(s, opt.level, opt.name, p, l))
 }
 
 func setsockoptGroupSourceReq(s uintptr, opt *sockOpt, ifi *net.Interface, grp, src net.IP) error {
-	var gsr sysGroupSourceReq
+	var gsr groupSourceReq
 	if ifi != nil {
 		gsr.Interface = uint32(ifi.Index)
 	}
@@ -45,15 +45,15 @@ func setsockoptGroupSourceReq(s uintptr, opt *sockOpt, ifi *net.Interface, grp,
 	var p unsafe.Pointer
 	var l uint32
 	if freebsd32o64 {
-		var d [sysSizeofGroupSourceReq + 4]byte
-		s := (*[sysSizeofGroupSourceReq]byte)(unsafe.Pointer(&gsr))
+		var d [sizeofGroupSourceReq + 4]byte
+		s := (*[sizeofGroupSourceReq]byte)(unsafe.Pointer(&gsr))
 		copy(d[:4], s[:4])
 		copy(d[8:], s[4:])
 		p = unsafe.Pointer(&d[0])
-		l = sysSizeofGroupSourceReq + 4
+		l = sizeofGroupSourceReq + 4
 	} else {
 		p = unsafe.Pointer(&gsr)
-		l = sysSizeofGroupSourceReq
+		l = sizeofGroupSourceReq
 	}
 	return os.NewSyscallError("setsockopt", setsockopt(s, opt.level, opt.name, p, l))
 }
diff --git a/ipv6/sys_bsd.go b/ipv6/sys_bsd.go
index 0ee43e6d..5c03e7f8 100644
--- a/ipv6/sys_bsd.go
+++ b/ipv6/sys_bsd.go
@@ -17,9 +17,9 @@ var (
 	ctlOpts = [ctlMax]ctlOpt{
 		ctlTrafficClass: {sysIPV6_TCLASS, 4, marshalTrafficClass, parseTrafficClass},
 		ctlHopLimit:     {sysIPV6_HOPLIMIT, 4, marshalHopLimit, parseHopLimit},
-		ctlPacketInfo:   {sysIPV6_PKTINFO, sysSizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo},
-		ctlNextHop:      {sysIPV6_NEXTHOP, sysSizeofSockaddrInet6, marshalNextHop, parseNextHop},
-		ctlPathMTU:      {sysIPV6_PATHMTU, sysSizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU},
+		ctlPacketInfo:   {sysIPV6_PKTINFO, sizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo},
+		ctlNextHop:      {sysIPV6_NEXTHOP, sizeofSockaddrInet6, marshalNextHop, parseNextHop},
+		ctlPathMTU:      {sysIPV6_PATHMTU, sizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU},
 	}
 
 	sockOpts = [ssoMax]sockOpt{
@@ -40,17 +40,17 @@ var (
 	}
 )
 
-func (sa *sysSockaddrInet6) setSockaddr(ip net.IP, i int) {
-	sa.Len = sysSizeofSockaddrInet6
+func (sa *sockaddrInet6) setSockaddr(ip net.IP, i int) {
+	sa.Len = sizeofSockaddrInet6
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], ip)
 	sa.Scope_id = uint32(i)
 }
 
-func (pi *sysInet6Pktinfo) setIfindex(i int) {
+func (pi *inet6Pktinfo) setIfindex(i int) {
 	pi.Ifindex = uint32(i)
 }
 
-func (mreq *sysIPv6Mreq) setIfindex(i int) {
+func (mreq *ipv6Mreq) setIfindex(i int) {
 	mreq.Interface = uint32(i)
 }
diff --git a/ipv6/sys_darwin.go b/ipv6/sys_darwin.go
index 7e5d2dfb..2900b726 100644
--- a/ipv6/sys_darwin.go
+++ b/ipv6/sys_darwin.go
@@ -17,7 +17,7 @@ import (
 var (
 	ctlOpts = [ctlMax]ctlOpt{
 		ctlHopLimit:   {sysIPV6_2292HOPLIMIT, 4, marshal2292HopLimit, parseHopLimit},
-		ctlPacketInfo: {sysIPV6_2292PKTINFO, sysSizeofInet6Pktinfo, marshal2292PacketInfo, parsePacketInfo},
+		ctlPacketInfo: {sysIPV6_2292PKTINFO, sizeofInet6Pktinfo, marshal2292PacketInfo, parsePacketInfo},
 	}
 
 	sockOpts = [ssoMax]sockOpt{
@@ -54,9 +54,9 @@ func init() {
 	}
 	ctlOpts[ctlTrafficClass] = ctlOpt{sysIPV6_TCLASS, 4, marshalTrafficClass, parseTrafficClass}
 	ctlOpts[ctlHopLimit] = ctlOpt{sysIPV6_HOPLIMIT, 4, marshalHopLimit, parseHopLimit}
-	ctlOpts[ctlPacketInfo] = ctlOpt{sysIPV6_PKTINFO, sysSizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo}
-	ctlOpts[ctlNextHop] = ctlOpt{sysIPV6_NEXTHOP, sysSizeofSockaddrInet6, marshalNextHop, parseNextHop}
-	ctlOpts[ctlPathMTU] = ctlOpt{sysIPV6_PATHMTU, sysSizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU}
+	ctlOpts[ctlPacketInfo] = ctlOpt{sysIPV6_PKTINFO, sizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo}
+	ctlOpts[ctlNextHop] = ctlOpt{sysIPV6_NEXTHOP, sizeofSockaddrInet6, marshalNextHop, parseNextHop}
+	ctlOpts[ctlPathMTU] = ctlOpt{sysIPV6_PATHMTU, sizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU}
 	sockOpts[ssoTrafficClass] = sockOpt{iana.ProtocolIPv6, sysIPV6_TCLASS, ssoTypeInt}
 	sockOpts[ssoReceiveTrafficClass] = sockOpt{iana.ProtocolIPv6, sysIPV6_RECVTCLASS, ssoTypeInt}
 	sockOpts[ssoReceiveHopLimit] = sockOpt{iana.ProtocolIPv6, sysIPV6_RECVHOPLIMIT, ssoTypeInt}
@@ -71,35 +71,35 @@ func init() {
 	sockOpts[ssoUnblockSourceGroup] = sockOpt{iana.ProtocolIPv6, sysMCAST_UNBLOCK_SOURCE, ssoTypeGroupSourceReq}
 }
 
-func (sa *sysSockaddrInet6) setSockaddr(ip net.IP, i int) {
-	sa.Len = sysSizeofSockaddrInet6
+func (sa *sockaddrInet6) setSockaddr(ip net.IP, i int) {
+	sa.Len = sizeofSockaddrInet6
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], ip)
 	sa.Scope_id = uint32(i)
 }
 
-func (pi *sysInet6Pktinfo) setIfindex(i int) {
+func (pi *inet6Pktinfo) setIfindex(i int) {
 	pi.Ifindex = uint32(i)
 }
 
-func (mreq *sysIPv6Mreq) setIfindex(i int) {
+func (mreq *ipv6Mreq) setIfindex(i int) {
 	mreq.Interface = uint32(i)
 }
 
-func (gr *sysGroupReq) setGroup(grp net.IP) {
-	sa := (*sysSockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gr)) + 4))
-	sa.Len = sysSizeofSockaddrInet6
+func (gr *groupReq) setGroup(grp net.IP) {
+	sa := (*sockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gr)) + 4))
+	sa.Len = sizeofSockaddrInet6
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], grp)
 }
 
-func (gsr *sysGroupSourceReq) setSourceGroup(grp, src net.IP) {
-	sa := (*sysSockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 4))
-	sa.Len = sysSizeofSockaddrInet6
+func (gsr *groupSourceReq) setSourceGroup(grp, src net.IP) {
+	sa := (*sockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 4))
+	sa.Len = sizeofSockaddrInet6
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], grp)
-	sa = (*sysSockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 132))
-	sa.Len = sysSizeofSockaddrInet6
+	sa = (*sockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 132))
+	sa.Len = sizeofSockaddrInet6
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], src)
 }
diff --git a/ipv6/sys_freebsd.go b/ipv6/sys_freebsd.go
index 5527001f..9ccc6578 100644
--- a/ipv6/sys_freebsd.go
+++ b/ipv6/sys_freebsd.go
@@ -18,9 +18,9 @@ var (
 	ctlOpts = [ctlMax]ctlOpt{
 		ctlTrafficClass: {sysIPV6_TCLASS, 4, marshalTrafficClass, parseTrafficClass},
 		ctlHopLimit:     {sysIPV6_HOPLIMIT, 4, marshalHopLimit, parseHopLimit},
-		ctlPacketInfo:   {sysIPV6_PKTINFO, sysSizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo},
-		ctlNextHop:      {sysIPV6_NEXTHOP, sysSizeofSockaddrInet6, marshalNextHop, parseNextHop},
-		ctlPathMTU:      {sysIPV6_PATHMTU, sysSizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU},
+		ctlPacketInfo:   {sysIPV6_PKTINFO, sizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo},
+		ctlNextHop:      {sysIPV6_NEXTHOP, sizeofSockaddrInet6, marshalNextHop, parseNextHop},
+		ctlPathMTU:      {sysIPV6_PATHMTU, sizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU},
 	}
 
 	sockOpts = [ssoMax]sockOpt{
@@ -57,35 +57,35 @@ func init() {
 	}
 }
 
-func (sa *sysSockaddrInet6) setSockaddr(ip net.IP, i int) {
-	sa.Len = sysSizeofSockaddrInet6
+func (sa *sockaddrInet6) setSockaddr(ip net.IP, i int) {
+	sa.Len = sizeofSockaddrInet6
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], ip)
 	sa.Scope_id = uint32(i)
 }
 
-func (pi *sysInet6Pktinfo) setIfindex(i int) {
+func (pi *inet6Pktinfo) setIfindex(i int) {
 	pi.Ifindex = uint32(i)
 }
 
-func (mreq *sysIPv6Mreq) setIfindex(i int) {
+func (mreq *ipv6Mreq) setIfindex(i int) {
 	mreq.Interface = uint32(i)
 }
 
-func (gr *sysGroupReq) setGroup(grp net.IP) {
-	sa := (*sysSockaddrInet6)(unsafe.Pointer(&gr.Group))
-	sa.Len = sysSizeofSockaddrInet6
+func (gr *groupReq) setGroup(grp net.IP) {
+	sa := (*sockaddrInet6)(unsafe.Pointer(&gr.Group))
+	sa.Len = sizeofSockaddrInet6
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], grp)
 }
 
-func (gsr *sysGroupSourceReq) setSourceGroup(grp, src net.IP) {
-	sa := (*sysSockaddrInet6)(unsafe.Pointer(&gsr.Group))
-	sa.Len = sysSizeofSockaddrInet6
+func (gsr *groupSourceReq) setSourceGroup(grp, src net.IP) {
+	sa := (*sockaddrInet6)(unsafe.Pointer(&gsr.Group))
+	sa.Len = sizeofSockaddrInet6
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], grp)
-	sa = (*sysSockaddrInet6)(unsafe.Pointer(&gsr.Source))
-	sa.Len = sysSizeofSockaddrInet6
+	sa = (*sockaddrInet6)(unsafe.Pointer(&gsr.Source))
+	sa.Len = sizeofSockaddrInet6
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], src)
 }
diff --git a/ipv6/sys_linux.go b/ipv6/sys_linux.go
index fd7d5b18..5ff18b56 100644
--- a/ipv6/sys_linux.go
+++ b/ipv6/sys_linux.go
@@ -16,8 +16,8 @@ var (
 	ctlOpts = [ctlMax]ctlOpt{
 		ctlTrafficClass: {sysIPV6_TCLASS, 4, marshalTrafficClass, parseTrafficClass},
 		ctlHopLimit:     {sysIPV6_HOPLIMIT, 4, marshalHopLimit, parseHopLimit},
-		ctlPacketInfo:   {sysIPV6_PKTINFO, sysSizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo},
-		ctlPathMTU:      {sysIPV6_PATHMTU, sysSizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU},
+		ctlPacketInfo:   {sysIPV6_PKTINFO, sizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo},
+		ctlPathMTU:      {sysIPV6_PATHMTU, sizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU},
 	}
 
 	sockOpts = [ssoMax]sockOpt{
@@ -42,31 +42,31 @@ var (
 	}
 )
 
-func (sa *sysSockaddrInet6) setSockaddr(ip net.IP, i int) {
+func (sa *sockaddrInet6) setSockaddr(ip net.IP, i int) {
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], ip)
 	sa.Scope_id = uint32(i)
 }
 
-func (pi *sysInet6Pktinfo) setIfindex(i int) {
+func (pi *inet6Pktinfo) setIfindex(i int) {
 	pi.Ifindex = int32(i)
 }
 
-func (mreq *sysIPv6Mreq) setIfindex(i int) {
+func (mreq *ipv6Mreq) setIfindex(i int) {
 	mreq.Ifindex = int32(i)
 }
 
-func (gr *sysGroupReq) setGroup(grp net.IP) {
-	sa := (*sysSockaddrInet6)(unsafe.Pointer(&gr.Group))
+func (gr *groupReq) setGroup(grp net.IP) {
+	sa := (*sockaddrInet6)(unsafe.Pointer(&gr.Group))
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], grp)
 }
 
-func (gsr *sysGroupSourceReq) setSourceGroup(grp, src net.IP) {
-	sa := (*sysSockaddrInet6)(unsafe.Pointer(&gsr.Group))
+func (gsr *groupSourceReq) setSourceGroup(grp, src net.IP) {
+	sa := (*sockaddrInet6)(unsafe.Pointer(&gsr.Group))
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], grp)
-	sa = (*sysSockaddrInet6)(unsafe.Pointer(&gsr.Source))
+	sa = (*sockaddrInet6)(unsafe.Pointer(&gsr.Source))
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], src)
 }
diff --git a/ipv6/sys_solaris.go b/ipv6/sys_solaris.go
index fa2e2e8a..9bd2d66f 100644
--- a/ipv6/sys_solaris.go
+++ b/ipv6/sys_solaris.go
@@ -16,9 +16,9 @@ var (
 	ctlOpts = [ctlMax]ctlOpt{
 		ctlTrafficClass: {sysIPV6_TCLASS, 4, marshalTrafficClass, parseTrafficClass},
 		ctlHopLimit:     {sysIPV6_HOPLIMIT, 4, marshalHopLimit, parseHopLimit},
-		ctlPacketInfo:   {sysIPV6_PKTINFO, sysSizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo},
-		ctlNextHop:      {sysIPV6_NEXTHOP, sysSizeofSockaddrInet6, marshalNextHop, parseNextHop},
-		ctlPathMTU:      {sysIPV6_PATHMTU, sysSizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU},
+		ctlPacketInfo:   {sysIPV6_PKTINFO, sizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo},
+		ctlNextHop:      {sysIPV6_NEXTHOP, sizeofSockaddrInet6, marshalNextHop, parseNextHop},
+		ctlPathMTU:      {sysIPV6_PATHMTU, sizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU},
 	}
 
 	sockOpts = [ssoMax]sockOpt{
@@ -43,31 +43,31 @@ var (
 	}
 )
 
-func (sa *sysSockaddrInet6) setSockaddr(ip net.IP, i int) {
+func (sa *sockaddrInet6) setSockaddr(ip net.IP, i int) {
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], ip)
 	sa.Scope_id = uint32(i)
 }
 
-func (pi *sysInet6Pktinfo) setIfindex(i int) {
+func (pi *inet6Pktinfo) setIfindex(i int) {
 	pi.Ifindex = uint32(i)
 }
 
-func (mreq *sysIPv6Mreq) setIfindex(i int) {
+func (mreq *ipv6Mreq) setIfindex(i int) {
 	mreq.Interface = uint32(i)
 }
 
-func (gr *sysGroupReq) setGroup(grp net.IP) {
-	sa := (*sysSockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gr)) + 4))
+func (gr *groupReq) setGroup(grp net.IP) {
+	sa := (*sockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gr)) + 4))
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], grp)
 }
 
-func (gsr *sysGroupSourceReq) setSourceGroup(grp, src net.IP) {
-	sa := (*sysSockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 4))
+func (gsr *groupSourceReq) setSourceGroup(grp, src net.IP) {
+	sa := (*sockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 4))
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], grp)
-	sa = (*sysSockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 260))
+	sa = (*sockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 260))
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], src)
 }
diff --git a/ipv6/sys_windows.go b/ipv6/sys_windows.go
index 40519068..63efc4a2 100644
--- a/ipv6/sys_windows.go
+++ b/ipv6/sys_windows.go
@@ -21,14 +21,14 @@ const (
 	sysIPV6_LEAVE_GROUP    = 0xd
 	sysIPV6_PKTINFO        = 0x13
 
-	sysSizeofSockaddrInet6 = 0x1c
+	sizeofSockaddrInet6 = 0x1c
 
-	sysSizeofIPv6Mreq     = 0x14
-	sysSizeofIPv6Mtuinfo  = 0x20
-	sysSizeofICMPv6Filter = 0
+	sizeofIPv6Mreq     = 0x14
+	sizeofIPv6Mtuinfo  = 0x20
+	sizeofICMPv6Filter = 0
 )
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Family   uint16
 	Port     uint16
 	Flowinfo uint32
@@ -36,17 +36,17 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Interface uint32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	// TODO(mikio): implement this
 }
 
@@ -63,12 +63,12 @@ var (
 	}
 )
 
-func (sa *sysSockaddrInet6) setSockaddr(ip net.IP, i int) {
+func (sa *sockaddrInet6) setSockaddr(ip net.IP, i int) {
 	sa.Family = syscall.AF_INET6
 	copy(sa.Addr[:], ip)
 	sa.Scope_id = uint32(i)
 }
 
-func (mreq *sysIPv6Mreq) setIfindex(i int) {
+func (mreq *ipv6Mreq) setIfindex(i int) {
 	mreq.Interface = uint32(i)
 }
diff --git a/ipv6/zsys_darwin.go b/ipv6/zsys_darwin.go
index cb044b03..6aab1dfa 100644
--- a/ipv6/zsys_darwin.go
+++ b/ipv6/zsys_darwin.go
@@ -71,19 +71,19 @@ const (
 	sysIPV6_PORTRANGE_HIGH    = 0x1
 	sysIPV6_PORTRANGE_LOW     = 0x2
 
-	sysSizeofSockaddrStorage = 0x80
-	sysSizeofSockaddrInet6   = 0x1c
-	sysSizeofInet6Pktinfo    = 0x14
-	sysSizeofIPv6Mtuinfo     = 0x20
+	sizeofSockaddrStorage = 0x80
+	sizeofSockaddrInet6   = 0x1c
+	sizeofInet6Pktinfo    = 0x14
+	sizeofIPv6Mtuinfo     = 0x20
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x84
-	sysSizeofGroupSourceReq = 0x104
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x84
+	sizeofGroupSourceReq = 0x104
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysSockaddrStorage struct {
+type sockaddrStorage struct {
 	Len         uint8
 	Family      uint8
 	X__ss_pad1  [6]int8
@@ -91,7 +91,7 @@ type sysSockaddrStorage struct {
 	X__ss_pad2  [112]int8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Len      uint8
 	Family   uint8
 	Port     uint16
@@ -100,31 +100,31 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex uint32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Interface uint32
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Filt [8]uint32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
 	Pad_cgo_0 [128]byte
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
 	Pad_cgo_0 [128]byte
 	Pad_cgo_1 [128]byte
diff --git a/ipv6/zsys_dragonfly.go b/ipv6/zsys_dragonfly.go
index 5a03ab73..eb317575 100644
--- a/ipv6/zsys_dragonfly.go
+++ b/ipv6/zsys_dragonfly.go
@@ -52,16 +52,16 @@ const (
 	sysIPV6_PORTRANGE_HIGH    = 0x1
 	sysIPV6_PORTRANGE_LOW     = 0x2
 
-	sysSizeofSockaddrInet6 = 0x1c
-	sysSizeofInet6Pktinfo  = 0x14
-	sysSizeofIPv6Mtuinfo   = 0x20
+	sizeofSockaddrInet6 = 0x1c
+	sizeofInet6Pktinfo  = 0x14
+	sizeofIPv6Mtuinfo   = 0x20
 
-	sysSizeofIPv6Mreq = 0x14
+	sizeofIPv6Mreq = 0x14
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Len      uint8
 	Family   uint8
 	Port     uint16
@@ -70,21 +70,21 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex uint32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Interface uint32
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Filt [8]uint32
 }
diff --git a/ipv6/zsys_freebsd_386.go b/ipv6/zsys_freebsd_386.go
index 4ace96f0..919e572d 100644
--- a/ipv6/zsys_freebsd_386.go
+++ b/ipv6/zsys_freebsd_386.go
@@ -62,19 +62,19 @@ const (
 	sysIPV6_PORTRANGE_HIGH    = 0x1
 	sysIPV6_PORTRANGE_LOW     = 0x2
 
-	sysSizeofSockaddrStorage = 0x80
-	sysSizeofSockaddrInet6   = 0x1c
-	sysSizeofInet6Pktinfo    = 0x14
-	sysSizeofIPv6Mtuinfo     = 0x20
+	sizeofSockaddrStorage = 0x80
+	sizeofSockaddrInet6   = 0x1c
+	sizeofInet6Pktinfo    = 0x14
+	sizeofIPv6Mtuinfo     = 0x20
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x84
-	sysSizeofGroupSourceReq = 0x104
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x84
+	sizeofGroupSourceReq = 0x104
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysSockaddrStorage struct {
+type sockaddrStorage struct {
 	Len         uint8
 	Family      uint8
 	X__ss_pad1  [6]int8
@@ -82,7 +82,7 @@ type sysSockaddrStorage struct {
 	X__ss_pad2  [112]int8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Len      uint8
 	Family   uint8
 	Port     uint16
@@ -91,32 +91,32 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex uint32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Interface uint32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
-	Group     sysSockaddrStorage
+	Group     sockaddrStorage
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
-	Group     sysSockaddrStorage
-	Source    sysSockaddrStorage
+	Group     sockaddrStorage
+	Source    sockaddrStorage
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Filt [8]uint32
 }
diff --git a/ipv6/zsys_freebsd_amd64.go b/ipv6/zsys_freebsd_amd64.go
index 4a62c2d5..cb8141f9 100644
--- a/ipv6/zsys_freebsd_amd64.go
+++ b/ipv6/zsys_freebsd_amd64.go
@@ -62,19 +62,19 @@ const (
 	sysIPV6_PORTRANGE_HIGH    = 0x1
 	sysIPV6_PORTRANGE_LOW     = 0x2
 
-	sysSizeofSockaddrStorage = 0x80
-	sysSizeofSockaddrInet6   = 0x1c
-	sysSizeofInet6Pktinfo    = 0x14
-	sysSizeofIPv6Mtuinfo     = 0x20
+	sizeofSockaddrStorage = 0x80
+	sizeofSockaddrInet6   = 0x1c
+	sizeofInet6Pktinfo    = 0x14
+	sizeofIPv6Mtuinfo     = 0x20
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x88
-	sysSizeofGroupSourceReq = 0x108
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x88
+	sizeofGroupSourceReq = 0x108
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysSockaddrStorage struct {
+type sockaddrStorage struct {
 	Len         uint8
 	Family      uint8
 	X__ss_pad1  [6]int8
@@ -82,7 +82,7 @@ type sysSockaddrStorage struct {
 	X__ss_pad2  [112]int8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Len      uint8
 	Family   uint8
 	Port     uint16
@@ -91,34 +91,34 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex uint32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Interface uint32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysSockaddrStorage
+	Group     sockaddrStorage
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysSockaddrStorage
-	Source    sysSockaddrStorage
+	Group     sockaddrStorage
+	Source    sockaddrStorage
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Filt [8]uint32
 }
diff --git a/ipv6/zsys_freebsd_arm.go b/ipv6/zsys_freebsd_arm.go
index 4a62c2d5..cb8141f9 100644
--- a/ipv6/zsys_freebsd_arm.go
+++ b/ipv6/zsys_freebsd_arm.go
@@ -62,19 +62,19 @@ const (
 	sysIPV6_PORTRANGE_HIGH    = 0x1
 	sysIPV6_PORTRANGE_LOW     = 0x2
 
-	sysSizeofSockaddrStorage = 0x80
-	sysSizeofSockaddrInet6   = 0x1c
-	sysSizeofInet6Pktinfo    = 0x14
-	sysSizeofIPv6Mtuinfo     = 0x20
+	sizeofSockaddrStorage = 0x80
+	sizeofSockaddrInet6   = 0x1c
+	sizeofInet6Pktinfo    = 0x14
+	sizeofIPv6Mtuinfo     = 0x20
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x88
-	sysSizeofGroupSourceReq = 0x108
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x88
+	sizeofGroupSourceReq = 0x108
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysSockaddrStorage struct {
+type sockaddrStorage struct {
 	Len         uint8
 	Family      uint8
 	X__ss_pad1  [6]int8
@@ -82,7 +82,7 @@ type sysSockaddrStorage struct {
 	X__ss_pad2  [112]int8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Len      uint8
 	Family   uint8
 	Port     uint16
@@ -91,34 +91,34 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex uint32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Interface uint32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysSockaddrStorage
+	Group     sockaddrStorage
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysSockaddrStorage
-	Source    sysSockaddrStorage
+	Group     sockaddrStorage
+	Source    sockaddrStorage
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Filt [8]uint32
 }
diff --git a/ipv6/zsys_linux_386.go b/ipv6/zsys_linux_386.go
index 36fccbb6..f5a41094 100644
--- a/ipv6/zsys_linux_386.go
+++ b/ipv6/zsys_linux_386.go
@@ -87,25 +87,25 @@ const (
 	sysSOL_SOCKET       = 0x1
 	sysSO_ATTACH_FILTER = 0x1a
 
-	sysSizeofKernelSockaddrStorage = 0x80
-	sysSizeofSockaddrInet6         = 0x1c
-	sysSizeofInet6Pktinfo          = 0x14
-	sysSizeofIPv6Mtuinfo           = 0x20
-	sysSizeofIPv6FlowlabelReq      = 0x20
+	sizeofKernelSockaddrStorage = 0x80
+	sizeofSockaddrInet6         = 0x1c
+	sizeofInet6Pktinfo          = 0x14
+	sizeofIPv6Mtuinfo           = 0x20
+	sizeofIPv6FlowlabelReq      = 0x20
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x84
-	sysSizeofGroupSourceReq = 0x104
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x84
+	sizeofGroupSourceReq = 0x104
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysKernelSockaddrStorage struct {
+type kernelSockaddrStorage struct {
 	Family  uint16
 	X__data [126]int8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Family   uint16
 	Port     uint16
 	Flowinfo uint32
@@ -113,17 +113,17 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex int32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6FlowlabelReq struct {
+type ipv6FlowlabelReq struct {
 	Dst        [16]byte /* in6_addr */
 	Label      uint32
 	Action     uint8
@@ -134,33 +134,33 @@ type sysIPv6FlowlabelReq struct {
 	X__flr_pad uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Ifindex   int32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
-	Group     sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
-	Group     sysKernelSockaddrStorage
-	Source    sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
+	Source    kernelSockaddrStorage
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Data [8]uint32
 }
 
-type sysSockFProg struct {
+type sockFProg struct {
 	Len       uint16
 	Pad_cgo_0 [2]byte
-	Filter    *sysSockFilter
+	Filter    *sockFilter
 }
 
-type sysSockFilter struct {
+type sockFilter struct {
 	Code uint16
 	Jt   uint8
 	Jf   uint8
diff --git a/ipv6/zsys_linux_amd64.go b/ipv6/zsys_linux_amd64.go
index 7461e7e0..f9376b65 100644
--- a/ipv6/zsys_linux_amd64.go
+++ b/ipv6/zsys_linux_amd64.go
@@ -87,25 +87,25 @@ const (
 	sysSOL_SOCKET       = 0x1
 	sysSO_ATTACH_FILTER = 0x1a
 
-	sysSizeofKernelSockaddrStorage = 0x80
-	sysSizeofSockaddrInet6         = 0x1c
-	sysSizeofInet6Pktinfo          = 0x14
-	sysSizeofIPv6Mtuinfo           = 0x20
-	sysSizeofIPv6FlowlabelReq      = 0x20
+	sizeofKernelSockaddrStorage = 0x80
+	sizeofSockaddrInet6         = 0x1c
+	sizeofInet6Pktinfo          = 0x14
+	sizeofIPv6Mtuinfo           = 0x20
+	sizeofIPv6FlowlabelReq      = 0x20
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x88
-	sysSizeofGroupSourceReq = 0x108
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x88
+	sizeofGroupSourceReq = 0x108
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysKernelSockaddrStorage struct {
+type kernelSockaddrStorage struct {
 	Family  uint16
 	X__data [126]int8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Family   uint16
 	Port     uint16
 	Flowinfo uint32
@@ -113,17 +113,17 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex int32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6FlowlabelReq struct {
+type ipv6FlowlabelReq struct {
 	Dst        [16]byte /* in6_addr */
 	Label      uint32
 	Action     uint8
@@ -134,35 +134,35 @@ type sysIPv6FlowlabelReq struct {
 	X__flr_pad uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Ifindex   int32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysKernelSockaddrStorage
-	Source    sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
+	Source    kernelSockaddrStorage
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Data [8]uint32
 }
 
-type sysSockFProg struct {
+type sockFProg struct {
 	Len       uint16
 	Pad_cgo_0 [6]byte
-	Filter    *sysSockFilter
+	Filter    *sockFilter
 }
 
-type sysSockFilter struct {
+type sockFilter struct {
 	Code uint16
 	Jt   uint8
 	Jf   uint8
diff --git a/ipv6/zsys_linux_arm.go b/ipv6/zsys_linux_arm.go
index 36fccbb6..f5a41094 100644
--- a/ipv6/zsys_linux_arm.go
+++ b/ipv6/zsys_linux_arm.go
@@ -87,25 +87,25 @@ const (
 	sysSOL_SOCKET       = 0x1
 	sysSO_ATTACH_FILTER = 0x1a
 
-	sysSizeofKernelSockaddrStorage = 0x80
-	sysSizeofSockaddrInet6         = 0x1c
-	sysSizeofInet6Pktinfo          = 0x14
-	sysSizeofIPv6Mtuinfo           = 0x20
-	sysSizeofIPv6FlowlabelReq      = 0x20
+	sizeofKernelSockaddrStorage = 0x80
+	sizeofSockaddrInet6         = 0x1c
+	sizeofInet6Pktinfo          = 0x14
+	sizeofIPv6Mtuinfo           = 0x20
+	sizeofIPv6FlowlabelReq      = 0x20
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x84
-	sysSizeofGroupSourceReq = 0x104
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x84
+	sizeofGroupSourceReq = 0x104
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysKernelSockaddrStorage struct {
+type kernelSockaddrStorage struct {
 	Family  uint16
 	X__data [126]int8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Family   uint16
 	Port     uint16
 	Flowinfo uint32
@@ -113,17 +113,17 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex int32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6FlowlabelReq struct {
+type ipv6FlowlabelReq struct {
 	Dst        [16]byte /* in6_addr */
 	Label      uint32
 	Action     uint8
@@ -134,33 +134,33 @@ type sysIPv6FlowlabelReq struct {
 	X__flr_pad uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Ifindex   int32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
-	Group     sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
-	Group     sysKernelSockaddrStorage
-	Source    sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
+	Source    kernelSockaddrStorage
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Data [8]uint32
 }
 
-type sysSockFProg struct {
+type sockFProg struct {
 	Len       uint16
 	Pad_cgo_0 [2]byte
-	Filter    *sysSockFilter
+	Filter    *sockFilter
 }
 
-type sysSockFilter struct {
+type sockFilter struct {
 	Code uint16
 	Jt   uint8
 	Jf   uint8
diff --git a/ipv6/zsys_linux_arm64.go b/ipv6/zsys_linux_arm64.go
index ed35f603..b8fba816 100644
--- a/ipv6/zsys_linux_arm64.go
+++ b/ipv6/zsys_linux_arm64.go
@@ -89,25 +89,25 @@ const (
 	sysSOL_SOCKET       = 0x1
 	sysSO_ATTACH_FILTER = 0x1a
 
-	sysSizeofKernelSockaddrStorage = 0x80
-	sysSizeofSockaddrInet6         = 0x1c
-	sysSizeofInet6Pktinfo          = 0x14
-	sysSizeofIPv6Mtuinfo           = 0x20
-	sysSizeofIPv6FlowlabelReq      = 0x20
+	sizeofKernelSockaddrStorage = 0x80
+	sizeofSockaddrInet6         = 0x1c
+	sizeofInet6Pktinfo          = 0x14
+	sizeofIPv6Mtuinfo           = 0x20
+	sizeofIPv6FlowlabelReq      = 0x20
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x88
-	sysSizeofGroupSourceReq = 0x108
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x88
+	sizeofGroupSourceReq = 0x108
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysKernelSockaddrStorage struct {
+type kernelSockaddrStorage struct {
 	Family  uint16
 	X__data [126]int8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Family   uint16
 	Port     uint16
 	Flowinfo uint32
@@ -115,17 +115,17 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex int32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6FlowlabelReq struct {
+type ipv6FlowlabelReq struct {
 	Dst        [16]byte /* in6_addr */
 	Label      uint32
 	Action     uint8
@@ -136,35 +136,35 @@ type sysIPv6FlowlabelReq struct {
 	X__flr_pad uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Ifindex   int32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysKernelSockaddrStorage
-	Source    sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
+	Source    kernelSockaddrStorage
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Data [8]uint32
 }
 
-type sysSockFProg struct {
+type sockFProg struct {
 	Len       uint16
 	Pad_cgo_0 [6]byte
-	Filter    *sysSockFilter
+	Filter    *sockFilter
 }
 
-type sysSockFilter struct {
+type sockFilter struct {
 	Code uint16
 	Jt   uint8
 	Jf   uint8
diff --git a/ipv6/zsys_linux_mips64.go b/ipv6/zsys_linux_mips64.go
index 141c8697..c20e6339 100644
--- a/ipv6/zsys_linux_mips64.go
+++ b/ipv6/zsys_linux_mips64.go
@@ -89,25 +89,25 @@ const (
 	sysSOL_SOCKET       = 0x1
 	sysSO_ATTACH_FILTER = 0x1a
 
-	sysSizeofKernelSockaddrStorage = 0x80
-	sysSizeofSockaddrInet6         = 0x1c
-	sysSizeofInet6Pktinfo          = 0x14
-	sysSizeofIPv6Mtuinfo           = 0x20
-	sysSizeofIPv6FlowlabelReq      = 0x20
+	sizeofKernelSockaddrStorage = 0x80
+	sizeofSockaddrInet6         = 0x1c
+	sizeofInet6Pktinfo          = 0x14
+	sizeofIPv6Mtuinfo           = 0x20
+	sizeofIPv6FlowlabelReq      = 0x20
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x88
-	sysSizeofGroupSourceReq = 0x108
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x88
+	sizeofGroupSourceReq = 0x108
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysKernelSockaddrStorage struct {
+type kernelSockaddrStorage struct {
 	Family  uint16
 	X__data [126]int8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Family   uint16
 	Port     uint16
 	Flowinfo uint32
@@ -115,17 +115,17 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex int32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6FlowlabelReq struct {
+type ipv6FlowlabelReq struct {
 	Dst        [16]byte /* in6_addr */
 	Label      uint32
 	Action     uint8
@@ -136,35 +136,35 @@ type sysIPv6FlowlabelReq struct {
 	X__flr_pad uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Ifindex   int32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysKernelSockaddrStorage
-	Source    sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
+	Source    kernelSockaddrStorage
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Data [8]uint32
 }
 
-type sysSockFProg struct {
+type sockFProg struct {
 	Len       uint16
 	Pad_cgo_0 [6]byte
-	Filter    *sysSockFilter
+	Filter    *sockFilter
 }
 
-type sysSockFilter struct {
+type sockFilter struct {
 	Code uint16
 	Jt   uint8
 	Jf   uint8
diff --git a/ipv6/zsys_linux_mips64le.go b/ipv6/zsys_linux_mips64le.go
index d50eb633..3f673942 100644
--- a/ipv6/zsys_linux_mips64le.go
+++ b/ipv6/zsys_linux_mips64le.go
@@ -89,25 +89,25 @@ const (
 	sysSOL_SOCKET       = 0x1
 	sysSO_ATTACH_FILTER = 0x1a
 
-	sysSizeofKernelSockaddrStorage = 0x80
-	sysSizeofSockaddrInet6         = 0x1c
-	sysSizeofInet6Pktinfo          = 0x14
-	sysSizeofIPv6Mtuinfo           = 0x20
-	sysSizeofIPv6FlowlabelReq      = 0x20
+	sizeofKernelSockaddrStorage = 0x80
+	sizeofSockaddrInet6         = 0x1c
+	sizeofInet6Pktinfo          = 0x14
+	sizeofIPv6Mtuinfo           = 0x20
+	sizeofIPv6FlowlabelReq      = 0x20
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x88
-	sysSizeofGroupSourceReq = 0x108
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x88
+	sizeofGroupSourceReq = 0x108
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysKernelSockaddrStorage struct {
+type kernelSockaddrStorage struct {
 	Family  uint16
 	X__data [126]int8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Family   uint16
 	Port     uint16
 	Flowinfo uint32
@@ -115,17 +115,17 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex int32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6FlowlabelReq struct {
+type ipv6FlowlabelReq struct {
 	Dst        [16]byte /* in6_addr */
 	Label      uint32
 	Action     uint8
@@ -136,35 +136,35 @@ type sysIPv6FlowlabelReq struct {
 	X__flr_pad uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Ifindex   int32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysKernelSockaddrStorage
-	Source    sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
+	Source    kernelSockaddrStorage
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Data [8]uint32
 }
 
-type sysSockFProg struct {
+type sockFProg struct {
 	Len       uint16
 	Pad_cgo_0 [6]byte
-	Filter    *sysSockFilter
+	Filter    *sockFilter
 }
 
-type sysSockFilter struct {
+type sockFilter struct {
 	Code uint16
 	Jt   uint8
 	Jf   uint8
diff --git a/ipv6/zsys_linux_ppc.go b/ipv6/zsys_linux_ppc.go
index 4c58ea67..7560dfd7 100644
--- a/ipv6/zsys_linux_ppc.go
+++ b/ipv6/zsys_linux_ppc.go
@@ -89,25 +89,25 @@ const (
 	sysSOL_SOCKET       = 0x1
 	sysSO_ATTACH_FILTER = 0x1a
 
-	sysSizeofKernelSockaddrStorage = 0x80
-	sysSizeofSockaddrInet6         = 0x1c
-	sysSizeofInet6Pktinfo          = 0x14
-	sysSizeofIPv6Mtuinfo           = 0x20
-	sysSizeofIPv6FlowlabelReq      = 0x20
+	sizeofKernelSockaddrStorage = 0x80
+	sizeofSockaddrInet6         = 0x1c
+	sizeofInet6Pktinfo          = 0x14
+	sizeofIPv6Mtuinfo           = 0x20
+	sizeofIPv6FlowlabelReq      = 0x20
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x84
-	sysSizeofGroupSourceReq = 0x104
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x84
+	sizeofGroupSourceReq = 0x104
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysKernelSockaddrStorage struct {
+type kernelSockaddrStorage struct {
 	Family  uint16
 	X__data [126]uint8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Family   uint16
 	Port     uint16
 	Flowinfo uint32
@@ -115,17 +115,17 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex int32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6FlowlabelReq struct {
+type ipv6FlowlabelReq struct {
 	Dst        [16]byte /* in6_addr */
 	Label      uint32
 	Action     uint8
@@ -136,33 +136,33 @@ type sysIPv6FlowlabelReq struct {
 	X__flr_pad uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Ifindex   int32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
-	Group     sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
-	Group     sysKernelSockaddrStorage
-	Source    sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
+	Source    kernelSockaddrStorage
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Data [8]uint32
 }
 
-type sysSockFProg struct {
+type sockFProg struct {
 	Len       uint16
 	Pad_cgo_0 [2]byte
-	Filter    *sysSockFilter
+	Filter    *sockFilter
 }
 
-type sysSockFilter struct {
+type sockFilter struct {
 	Code uint16
 	Jt   uint8
 	Jf   uint8
diff --git a/ipv6/zsys_linux_ppc64.go b/ipv6/zsys_linux_ppc64.go
index c1d775f7..399166d4 100644
--- a/ipv6/zsys_linux_ppc64.go
+++ b/ipv6/zsys_linux_ppc64.go
@@ -89,25 +89,25 @@ const (
 	sysSOL_SOCKET       = 0x1
 	sysSO_ATTACH_FILTER = 0x1a
 
-	sysSizeofKernelSockaddrStorage = 0x80
-	sysSizeofSockaddrInet6         = 0x1c
-	sysSizeofInet6Pktinfo          = 0x14
-	sysSizeofIPv6Mtuinfo           = 0x20
-	sysSizeofIPv6FlowlabelReq      = 0x20
+	sizeofKernelSockaddrStorage = 0x80
+	sizeofSockaddrInet6         = 0x1c
+	sizeofInet6Pktinfo          = 0x14
+	sizeofIPv6Mtuinfo           = 0x20
+	sizeofIPv6FlowlabelReq      = 0x20
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x88
-	sysSizeofGroupSourceReq = 0x108
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x88
+	sizeofGroupSourceReq = 0x108
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysKernelSockaddrStorage struct {
+type kernelSockaddrStorage struct {
 	Family  uint16
 	X__data [126]int8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Family   uint16
 	Port     uint16
 	Flowinfo uint32
@@ -115,17 +115,17 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex int32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6FlowlabelReq struct {
+type ipv6FlowlabelReq struct {
 	Dst        [16]byte /* in6_addr */
 	Label      uint32
 	Action     uint8
@@ -136,35 +136,35 @@ type sysIPv6FlowlabelReq struct {
 	X__flr_pad uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Ifindex   int32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysKernelSockaddrStorage
-	Source    sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
+	Source    kernelSockaddrStorage
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Data [8]uint32
 }
 
-type sysSockFProg struct {
+type sockFProg struct {
 	Len       uint16
 	Pad_cgo_0 [6]byte
-	Filter    *sysSockFilter
+	Filter    *sockFilter
 }
 
-type sysSockFilter struct {
+type sockFilter struct {
 	Code uint16
 	Jt   uint8
 	Jf   uint8
diff --git a/ipv6/zsys_linux_ppc64le.go b/ipv6/zsys_linux_ppc64le.go
index e385fb7a..be5d6dcc 100644
--- a/ipv6/zsys_linux_ppc64le.go
+++ b/ipv6/zsys_linux_ppc64le.go
@@ -89,25 +89,25 @@ const (
 	sysSOL_SOCKET       = 0x1
 	sysSO_ATTACH_FILTER = 0x1a
 
-	sysSizeofKernelSockaddrStorage = 0x80
-	sysSizeofSockaddrInet6         = 0x1c
-	sysSizeofInet6Pktinfo          = 0x14
-	sysSizeofIPv6Mtuinfo           = 0x20
-	sysSizeofIPv6FlowlabelReq      = 0x20
+	sizeofKernelSockaddrStorage = 0x80
+	sizeofSockaddrInet6         = 0x1c
+	sizeofInet6Pktinfo          = 0x14
+	sizeofIPv6Mtuinfo           = 0x20
+	sizeofIPv6FlowlabelReq      = 0x20
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x88
-	sysSizeofGroupSourceReq = 0x108
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x88
+	sizeofGroupSourceReq = 0x108
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysKernelSockaddrStorage struct {
+type kernelSockaddrStorage struct {
 	Family  uint16
 	X__data [126]int8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Family   uint16
 	Port     uint16
 	Flowinfo uint32
@@ -115,17 +115,17 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex int32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6FlowlabelReq struct {
+type ipv6FlowlabelReq struct {
 	Dst        [16]byte /* in6_addr */
 	Label      uint32
 	Action     uint8
@@ -136,35 +136,35 @@ type sysIPv6FlowlabelReq struct {
 	X__flr_pad uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Ifindex   int32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysKernelSockaddrStorage
-	Source    sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
+	Source    kernelSockaddrStorage
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Data [8]uint32
 }
 
-type sysSockFProg struct {
+type sockFProg struct {
 	Len       uint16
 	Pad_cgo_0 [6]byte
-	Filter    *sysSockFilter
+	Filter    *sockFilter
 }
 
-type sysSockFilter struct {
+type sockFilter struct {
 	Code uint16
 	Jt   uint8
 	Jf   uint8
diff --git a/ipv6/zsys_linux_s390x.go b/ipv6/zsys_linux_s390x.go
index 28d69b1b..b5fa0fbd 100644
--- a/ipv6/zsys_linux_s390x.go
+++ b/ipv6/zsys_linux_s390x.go
@@ -89,25 +89,25 @@ const (
 	sysSOL_SOCKET       = 0x1
 	sysSO_ATTACH_FILTER = 0x1a
 
-	sysSizeofKernelSockaddrStorage = 0x80
-	sysSizeofSockaddrInet6         = 0x1c
-	sysSizeofInet6Pktinfo          = 0x14
-	sysSizeofIPv6Mtuinfo           = 0x20
-	sysSizeofIPv6FlowlabelReq      = 0x20
+	sizeofKernelSockaddrStorage = 0x80
+	sizeofSockaddrInet6         = 0x1c
+	sizeofInet6Pktinfo          = 0x14
+	sizeofIPv6Mtuinfo           = 0x20
+	sizeofIPv6FlowlabelReq      = 0x20
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x88
-	sysSizeofGroupSourceReq = 0x108
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x88
+	sizeofGroupSourceReq = 0x108
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysKernelSockaddrStorage struct {
+type kernelSockaddrStorage struct {
 	Family  uint16
 	X__data [126]int8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Family   uint16
 	Port     uint16
 	Flowinfo uint32
@@ -115,17 +115,17 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex int32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6FlowlabelReq struct {
+type ipv6FlowlabelReq struct {
 	Dst        [16]byte /* in6_addr */
 	Label      uint32
 	Action     uint8
@@ -136,35 +136,35 @@ type sysIPv6FlowlabelReq struct {
 	X__flr_pad uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Ifindex   int32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
 	Pad_cgo_0 [4]byte
-	Group     sysKernelSockaddrStorage
-	Source    sysKernelSockaddrStorage
+	Group     kernelSockaddrStorage
+	Source    kernelSockaddrStorage
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Data [8]uint32
 }
 
-type sysSockFProg struct {
+type sockFProg struct {
 	Len       uint16
 	Pad_cgo_0 [6]byte
-	Filter    *sysSockFilter
+	Filter    *sockFilter
 }
 
-type sysSockFilter struct {
+type sockFilter struct {
 	Code uint16
 	Jt   uint8
 	Jf   uint8
diff --git a/ipv6/zsys_netbsd.go b/ipv6/zsys_netbsd.go
index d6ec88e3..bcada13b 100644
--- a/ipv6/zsys_netbsd.go
+++ b/ipv6/zsys_netbsd.go
@@ -46,16 +46,16 @@ const (
 	sysIPV6_PORTRANGE_HIGH    = 0x1
 	sysIPV6_PORTRANGE_LOW     = 0x2
 
-	sysSizeofSockaddrInet6 = 0x1c
-	sysSizeofInet6Pktinfo  = 0x14
-	sysSizeofIPv6Mtuinfo   = 0x20
+	sizeofSockaddrInet6 = 0x1c
+	sizeofInet6Pktinfo  = 0x14
+	sizeofIPv6Mtuinfo   = 0x20
 
-	sysSizeofIPv6Mreq = 0x14
+	sizeofIPv6Mreq = 0x14
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Len      uint8
 	Family   uint8
 	Port     uint16
@@ -64,21 +64,21 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex uint32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Interface uint32
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Filt [8]uint32
 }
diff --git a/ipv6/zsys_openbsd.go b/ipv6/zsys_openbsd.go
index 3e080b78..86cf3c63 100644
--- a/ipv6/zsys_openbsd.go
+++ b/ipv6/zsys_openbsd.go
@@ -55,16 +55,16 @@ const (
 	sysIPV6_PORTRANGE_HIGH    = 0x1
 	sysIPV6_PORTRANGE_LOW     = 0x2
 
-	sysSizeofSockaddrInet6 = 0x1c
-	sysSizeofInet6Pktinfo  = 0x14
-	sysSizeofIPv6Mtuinfo   = 0x20
+	sizeofSockaddrInet6 = 0x1c
+	sizeofInet6Pktinfo  = 0x14
+	sizeofIPv6Mtuinfo   = 0x20
 
-	sysSizeofIPv6Mreq = 0x14
+	sizeofIPv6Mreq = 0x14
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Len      uint8
 	Family   uint8
 	Port     uint16
@@ -73,21 +73,21 @@ type sysSockaddrInet6 struct {
 	Scope_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex uint32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Interface uint32
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	Filt [8]uint32
 }
diff --git a/ipv6/zsys_solaris.go b/ipv6/zsys_solaris.go
index b7dc48b8..eaebe058 100644
--- a/ipv6/zsys_solaris.go
+++ b/ipv6/zsys_solaris.go
@@ -74,26 +74,26 @@ const (
 
 	sysICMP6_FILTER = 0x1
 
-	sysSizeofSockaddrStorage = 0x100
-	sysSizeofSockaddrInet6   = 0x20
-	sysSizeofInet6Pktinfo    = 0x14
-	sysSizeofIPv6Mtuinfo     = 0x24
+	sizeofSockaddrStorage = 0x100
+	sizeofSockaddrInet6   = 0x20
+	sizeofInet6Pktinfo    = 0x14
+	sizeofIPv6Mtuinfo     = 0x24
 
-	sysSizeofIPv6Mreq       = 0x14
-	sysSizeofGroupReq       = 0x104
-	sysSizeofGroupSourceReq = 0x204
+	sizeofIPv6Mreq       = 0x14
+	sizeofGroupReq       = 0x104
+	sizeofGroupSourceReq = 0x204
 
-	sysSizeofICMPv6Filter = 0x20
+	sizeofICMPv6Filter = 0x20
 )
 
-type sysSockaddrStorage struct {
+type sockaddrStorage struct {
 	Family     uint16
 	X_ss_pad1  [6]int8
 	X_ss_align float64
 	X_ss_pad2  [240]int8
 }
 
-type sysSockaddrInet6 struct {
+type sockaddrInet6 struct {
 	Family         uint16
 	Port           uint16
 	Flowinfo       uint32
@@ -102,32 +102,32 @@ type sysSockaddrInet6 struct {
 	X__sin6_src_id uint32
 }
 
-type sysInet6Pktinfo struct {
+type inet6Pktinfo struct {
 	Addr    [16]byte /* in6_addr */
 	Ifindex uint32
 }
 
-type sysIPv6Mtuinfo struct {
-	Addr sysSockaddrInet6
+type ipv6Mtuinfo struct {
+	Addr sockaddrInet6
 	Mtu  uint32
 }
 
-type sysIPv6Mreq struct {
+type ipv6Mreq struct {
 	Multiaddr [16]byte /* in6_addr */
 	Interface uint32
 }
 
-type sysGroupReq struct {
+type groupReq struct {
 	Interface uint32
 	Pad_cgo_0 [256]byte
 }
 
-type sysGroupSourceReq struct {
+type groupSourceReq struct {
 	Interface uint32
 	Pad_cgo_0 [256]byte
 	Pad_cgo_1 [256]byte
 }
 
-type sysICMPv6Filter struct {
+type icmpv6Filter struct {
 	X__icmp6_filt [8]uint32
 }