diff --git a/include/osmocom/gprs/gprs_ns2.h b/include/osmocom/gprs/gprs_ns2.h
index a9c144c..7c7e221 100644
--- a/include/osmocom/gprs/gprs_ns2.h
+++ b/include/osmocom/gprs/gprs_ns2.h
@@ -249,7 +249,7 @@
 int gprs_ns2_ip_bind_set_priority(struct gprs_ns2_vc_bind *bind, uint8_t priority);
 struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_bind(
 		struct gprs_ns2_vc_bind *bind,
-		const struct osmo_sockaddr *saddr);
+		const struct osmo_sockaddr *rem_addr);
 
 int gprs_ns2_frgre_bind(struct gprs_ns2_inst *nsi,
 			const char *name,
diff --git a/src/gb/gprs_ns2_udp.c b/src/gb/gprs_ns2_udp.c
index 4816021..7ecf276 100644
--- a/src/gb/gprs_ns2_udp.c
+++ b/src/gb/gprs_ns2_udp.c
@@ -118,10 +118,10 @@
 
 /*! Find a NS-VC by its remote socket address.
  *  \param[in] bind in which to search
- *  \param[in] saddr remote peer socket adddress to search
+ *  \param[in] rem_addr remote peer socket address to search
  *  \returns NS-VC matching sockaddr; NULL if none found */
 struct gprs_ns2_vc *gprs_ns2_nsvc_by_sockaddr_bind(struct gprs_ns2_vc_bind *bind,
-						   const struct osmo_sockaddr *saddr)
+						   const struct osmo_sockaddr *rem_addr)
 {
 	struct gprs_ns2_vc *nsvc;
 	struct priv_vc *vcpriv;
@@ -130,9 +130,9 @@
 
 	llist_for_each_entry(nsvc, &bind->nsvc, blist) {
 		vcpriv = nsvc->priv;
-		if (vcpriv->remote.u.sa.sa_family != saddr->u.sa.sa_family)
+		if (vcpriv->remote.u.sa.sa_family != rem_addr->u.sa.sa_family)
 			continue;
-		if (osmo_sockaddr_cmp(&vcpriv->remote, saddr))
+		if (osmo_sockaddr_cmp(&vcpriv->remote, rem_addr))
 			continue;
 
 		return nsvc;