5 files changed, 27 insertions, 27 deletions

diff --git a/src/supplemental/http/http_api.h b/src/supplemental/http/http_api.h
index 1305b5a0..33947abf 100644
--- a/src/supplemental/http/http_api.h
+++ b/src/supplemental/http/http_api.h
@@ -205,9 +205,9 @@ extern int nni_http_server_set_tls(nni_http_server *, struct nng_tls_config *);
 extern int nni_http_server_get_tls(
     nni_http_server *, struct nng_tls_config **);
 
-extern int nni_http_server_setx(
+extern int nni_http_server_set(
     nni_http_server *, const char *, const void *, size_t, nni_type);
-extern int nni_http_server_getx(
+extern int nni_http_server_get(
     nni_http_server *, const char *, void *, size_t *, nni_type);
 
 // nni_http_server_start starts listening on the supplied port.
@@ -359,9 +359,9 @@ extern int nni_http_client_set_tls(nni_http_client *, struct nng_tls_config *);
 extern int nni_http_client_get_tls(
     nni_http_client *, struct nng_tls_config **);
 
-extern int nni_http_client_setx(
-    nni_http_client *, const char *, const void *, size_t, nni_type);
-extern int nni_http_client_getx(
+extern int nni_http_client_set(
+    nni_http_client *, const char *, const void *buf, size_t, nni_type);
+extern int nni_http_client_get(
     nni_http_client *, const char *, void *, size_t *, nni_type);
 
 extern void nni_http_client_connect(nni_http_client *, nni_aio *);
diff --git a/src/supplemental/http/http_client.c b/src/supplemental/http/http_client.c
index 68f0f61c..c420e1ff 100644
--- a/src/supplemental/http/http_client.c
+++ b/src/supplemental/http/http_client.c
@@ -142,7 +142,7 @@ int
 nni_http_client_set_tls(nni_http_client *c, nng_tls_config *tls)
 {
 	int rv;
-	rv = nni_stream_dialer_setx(c->dialer, NNG_OPT_TLS_CONFIG, &tls,
+	rv = nni_stream_dialer_set(c->dialer, NNG_OPT_TLS_CONFIG, &tls,
 	    sizeof(tls), NNI_TYPE_POINTER);
 	return (rv);
 }
@@ -152,24 +152,24 @@ nni_http_client_get_tls(nni_http_client *c, nng_tls_config **tlsp)
 {
 	size_t sz = sizeof(*tlsp);
 	int    rv;
-	rv = nni_stream_dialer_getx(
+	rv = nni_stream_dialer_get(
 	    c->dialer, NNG_OPT_TLS_CONFIG, tlsp, &sz, NNI_TYPE_POINTER);
 	return (rv);
 }
 
 int
-nni_http_client_setx(nni_http_client *c, const char *name, const void *buf,
+nni_http_client_set(nni_http_client *c, const char *name, const void *buf,
     size_t sz, nni_type t)
 {
 	// We have no local options, but we just pass them straight through.
-	return (nni_stream_dialer_setx(c->dialer, name, buf, sz, t));
+	return (nni_stream_dialer_set(c->dialer, name, buf, sz, t));
 }
 
 int
-nni_http_client_getx(
+nni_http_client_get(
     nni_http_client *c, const char *name, void *buf, size_t *szp, nni_type t)
 {
-	return (nni_stream_dialer_getx(c->dialer, name, buf, szp, t));
+	return (nni_stream_dialer_get(c->dialer, name, buf, szp, t));
 }
 
 static void
diff --git a/src/supplemental/http/http_conn.c b/src/supplemental/http/http_conn.c
index 4b0c81c0..646a3067 100644
--- a/src/supplemental/http/http_conn.c
+++ b/src/supplemental/http/http_conn.c
@@ -656,7 +656,7 @@ nni_http_conn_getopt(
 	if (conn->closed) {
 		rv = NNG_ECLOSED;
 	} else {
-		rv = nni_stream_getx(conn->sock, name, buf, szp, t);
+		rv = nni_stream_get(conn->sock, name, buf, szp, t);
 	}
 	nni_mtx_unlock(&conn->mtx);
 	return (rv);
@@ -671,7 +671,7 @@ nni_http_conn_setopt(nni_http_conn *conn, const char *name, const void *buf,
 	if (conn->closed) {
 		rv = NNG_ECLOSED;
 	} else {
-		rv = nni_stream_setx(conn->sock, name, buf, sz, t);
+		rv = nni_stream_set(conn->sock, name, buf, sz, t);
 	}
 	nni_mtx_unlock(&conn->mtx);
 	return (rv);
diff --git a/src/supplemental/http/http_public.c b/src/supplemental/http/http_public.c
index 60ca2693..7900aa7f 100644
--- a/src/supplemental/http/http_public.c
+++ b/src/supplemental/http/http_public.c
@@ -779,29 +779,29 @@ nng_http_server_set_tls(nng_http_server *srv, struct nng_tls_config *cfg)
 }
 
 int
-nng_http_server_get_tls(nng_http_server *srv, struct nng_tls_config **cfgp)
+nng_http_server_get_tls(nng_http_server *srv, struct nng_tls_config **cfg)
 {
 #if defined(NNG_SUPP_HTTP) && defined(NNG_SUPP_TLS)
-	return (nni_http_server_get_tls(srv, cfgp));
+	return (nni_http_server_get_tls(srv, cfg));
 #else
 	NNI_ARG_UNUSED(srv);
-	NNI_ARG_UNUSED(cfgp);
+	NNI_ARG_UNUSED(cfg);
 	return (NNG_ENOTSUP);
 #endif
 }
 
 int
-nng_http_server_get_addr(nng_http_server *srv, nng_sockaddr *addrp)
+nng_http_server_get_addr(nng_http_server *srv, nng_sockaddr *addr)
 {
 #ifdef NNG_SUPP_HTTP
 	size_t size = sizeof(nng_sockaddr);
-	if (srv == NULL || addrp == NULL)
+	if (srv == NULL || addr == NULL)
 		return NNG_EINVAL;
-	return (nni_http_server_getx(
-	    srv, NNG_OPT_LOCADDR, addrp, &size, NNI_TYPE_SOCKADDR));
+	return (nni_http_server_get(
+	    srv, NNG_OPT_LOCADDR, addr, &size, NNI_TYPE_SOCKADDR));
 #else
 	NNI_ARG_UNUSED(srv);
-	NNI_ARG_UNUSED(addrp);
+	NNI_ARG_UNUSED(addr);
 	return (NNG_ENOTSUP);
 #endif
 }
diff --git a/src/supplemental/http/http_server.c b/src/supplemental/http/http_server.c
index d43dd888..46f2ce8a 100644
--- a/src/supplemental/http/http_server.c
+++ b/src/supplemental/http/http_server.c
@@ -1869,7 +1869,7 @@ int
 nni_http_server_set_tls(nni_http_server *s, nng_tls_config *tls)
 {
 	int rv;
-	rv = nni_stream_listener_setx(s->listener, NNG_OPT_TLS_CONFIG, &tls,
+	rv = nni_stream_listener_set(s->listener, NNG_OPT_TLS_CONFIG, &tls,
 	    sizeof(tls), NNI_TYPE_POINTER);
 	return (rv);
 }
@@ -1879,24 +1879,24 @@ nni_http_server_get_tls(nni_http_server *s, nng_tls_config **tlsp)
 {
 	size_t sz = sizeof(*tlsp);
 	int    rv;
-	rv = nni_stream_listener_getx(
+	rv = nni_stream_listener_get(
 	    s->listener, NNG_OPT_TLS_CONFIG, tlsp, &sz, NNI_TYPE_POINTER);
 	return (rv);
 }
 
 int
-nni_http_server_setx(nni_http_server *s, const char *name, const void *buf,
+nni_http_server_set(nni_http_server *s, const char *name, const void *buf,
     size_t sz, nni_type t)
 {
 	// We have no local options, but we just pass them straight through.
-	return (nni_stream_listener_setx(s->listener, name, buf, sz, t));
+	return (nni_stream_listener_set(s->listener, name, buf, sz, t));
 }
 
 int
-nni_http_server_getx(
+nni_http_server_get(
     nni_http_server *s, const char *name, void *buf, size_t *szp, nni_type t)
 {
-	return (nni_stream_listener_getx(s->listener, name, buf, szp, t));
+	return (nni_stream_listener_get(s->listener, name, buf, szp, t));
 }
 
 void