Index: lib/libprocstat/libprocstat.c
===================================================================
--- lib/libprocstat/libprocstat.c
+++ lib/libprocstat/libprocstat.c
@@ -1558,10 +1558,10 @@
 	sock->dom_family = kif->kf_sock_domain;
 	sock->so_pcb = kif->kf_un.kf_sock.kf_sock_pcb;
 	strlcpy(sock->dname, kif->kf_path, sizeof(sock->dname));
-	bcopy(&kif->kf_un.kf_sock.kf_sa_local, &sock->sa_local,
-	    kif->kf_un.kf_sock.kf_sa_local.ss_len);
-	bcopy(&kif->kf_un.kf_sock.kf_sa_peer, &sock->sa_peer,
-	    kif->kf_un.kf_sock.kf_sa_peer.ss_len);
+	bcopy(&kif->kf_un.kf_sock.kf_sock_local, &sock->sa_local,
+	    kif->kf_un.kf_sock.kf_sock_local.ss_len);
+	bcopy(&kif->kf_un.kf_sock.kf_sock_peer, &sock->sa_peer,
+	    kif->kf_un.kf_sock.kf_sock_peer.ss_len);
 
 	/*
 	 * Protocol specific data.
Index: sys/kern/sys_socket.c
===================================================================
--- sys/kern/sys_socket.c
+++ sys/kern/sys_socket.c
@@ -396,14 +396,14 @@
 	}
 	error = so->so_proto->pr_usrreqs->pru_sockaddr(so, &sa);
 	if (error == 0 &&
-	    sa->sa_len <= sizeof(kif->kf_un.kf_sock.kf_sa_local)) {
-		bcopy(sa, &kif->kf_un.kf_sock.kf_sa_local, sa->sa_len);
+	    sa->sa_len <= sizeof(kif->kf_un.kf_sock.kf_sock_local)) {
+		bcopy(sa, &kif->kf_un.kf_sock.kf_sock_local, sa->sa_len);
 		free(sa, M_SONAME);
 	}
 	error = so->so_proto->pr_usrreqs->pru_peeraddr(so, &sa);
 	if (error == 0 &&
-	    sa->sa_len <= sizeof(kif->kf_un.kf_sock.kf_sa_peer)) {
-		bcopy(sa, &kif->kf_un.kf_sock.kf_sa_peer, sa->sa_len);
+	    sa->sa_len <= sizeof(kif->kf_un.kf_sock.kf_sock_peer)) {
+		bcopy(sa, &kif->kf_un.kf_sock.kf_sock_peer, sa->sa_len);
 		free(sa, M_SONAME);
 	}
 	strncpy(kif->kf_path, so->so_proto->pr_domain->dom_name,
Index: sys/sys/user.h
===================================================================
--- sys/sys/user.h
+++ sys/sys/user.h
@@ -355,9 +355,9 @@
 			/* Socket protocol. */
 			int		kf_sock_protocol0;
 			/* Socket address. */
-			struct sockaddr_storage kf_sa_local;
+			struct sockaddr_storage kf_sock_local;
 			/* Peer address. */
-			struct sockaddr_storage	kf_sa_peer;
+			struct sockaddr_storage	kf_sock_peer;
 			/* Address of so_pcb. */
 			uint64_t	kf_sock_pcb;
 			/* Address of inp_ppcb. */
@@ -438,6 +438,8 @@
 #define	kf_sock_domain	kf_un.kf_sock.kf_sock_domain0
 #define	kf_sock_type	kf_un.kf_sock.kf_sock_type0
 #define	kf_sock_protocol	kf_un.kf_sock.kf_sock_protocol0
+#define	kf_sa_local	kf_un.kf_sock.kf_sock_local
+#define	kf_sa_peer	kf_un.kf_sock.kf_sock_peer
 #endif
 
 /*