diff --git a/include/osmocom/iuh/hnbgw.h b/include/osmocom/iuh/hnbgw.h
index db22d97..58bdab4 100644
--- a/include/osmocom/iuh/hnbgw.h
+++ b/include/osmocom/iuh/hnbgw.h
@@ -116,10 +116,8 @@
 		/*! The UDP port where we receive multiplexed CS user
 		 * plane traffic from HNBs */
 		uint16_t iuh_cs_mux_port;
-		const char *iucs_remote_ip;
-		uint16_t iucs_remote_port;
-		const char *iups_remote_ip;
-		uint16_t iups_remote_port;
+		const char *iucs_remote_addr_name;
+		const char *iups_remote_addr_name;
 		uint16_t rnc_id;
 		bool hnbap_allow_tmsi;
 	} config;
@@ -134,11 +132,11 @@
 
 	/* currently active CN links for CS and PS */
 	struct {
-		struct osmo_sccp_instance *instance;
+		struct osmo_sccp_instance *client;
 		struct hnbgw_cnlink *cnlink;
 		struct osmo_sccp_addr local_addr;
-		struct osmo_sccp_addr remote_addr_cs;
-		struct osmo_sccp_addr remote_addr_ps;
+		struct osmo_sccp_addr iucs_remote_addr;
+		struct osmo_sccp_addr iups_remote_addr;
 	} sccp;
 };
 
diff --git a/include/osmocom/iuh/hnbgw_cn.h b/include/osmocom/iuh/hnbgw_cn.h
index 93123f2..2e61d82 100644
--- a/include/osmocom/iuh/hnbgw_cn.h
+++ b/include/osmocom/iuh/hnbgw_cn.h
@@ -2,5 +2,4 @@
 
 #include <osmocom/iuh/hnbgw.h>
 
-int hnbgw_cnlink_init(struct hnb_gw *gw, const char *stp_host, uint16_t stp_port,
-		      const char *local_ip, uint32_t local_pc);
+int hnbgw_cnlink_init(struct hnb_gw *gw, const char *stp_host, uint16_t stp_port, const char *local_ip);