diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 6787573ef1a..4d58bbc33d8 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1546,7 +1546,7 @@ sooptcopyin(sopt, buf, len, minlen)
  * XXX: optlen is size_t, not socklen_t
  */
 int
-kern_setsockopt(struct socket *so, int level, int optname, void *optval,
+so_setsockopt(struct socket *so, int level, int optname, void *optval,
     size_t optlen)
 {
 	struct sockopt sopt;
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index 191d5d27350..e875f5ca964 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -176,8 +176,8 @@ nfs_connect(struct nfsmount *nmp, struct nfsreq *rep)
 	nmp->nm_soflags = so->so_proto->pr_flags;
 
 	opt = 1;
-	(void)kern_setsockopt(so, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
-	(void)kern_setsockopt(so, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt));
+	(void)so_setsockopt(so, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt));
+	(void)so_setsockopt(so, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt));
 
 	/*
 	 * Some servers require that the client port be a reserved port number.
diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h
index cfe061b14fc..8fad3673cd2 100644
--- a/sys/sys/socketvar.h
+++ b/sys/sys/socketvar.h
@@ -438,8 +438,8 @@ struct uio;
 /*
  * From uipc_socket and friends
  */
-int	kern_setsockopt(struct socket *so, int level, int optname,
-    void *optval, size_t optlen);
+int	so_setsockopt(struct socket *so, int level, int optname,
+	    void *optval, size_t optlen);
 int	sockargs(struct mbuf **mp, caddr_t buf, int buflen, int type);
 int	getsockaddr(struct sockaddr **namp, caddr_t uaddr, size_t len);
 void	sbappend(struct sockbuf *sb, struct mbuf *m);