diff --git a/openbsc/src/osmo-bsc/osmo_bsc_msc.c b/openbsc/src/osmo-bsc/osmo_bsc_msc.c
index 0acc290..3de5c44 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_msc.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_msc.c
@@ -171,7 +171,7 @@
  */
 int msc_queue_write(struct bsc_msc_connection *conn, struct msgb *msg, int proto)
 {
-	ipaccess_prepend_header(msg, proto);
+	ipa_prepend_header(msg, proto);
 	if (osmo_wqueue_enqueue(&conn->write_queue, msg) != 0) {
 		LOGP(DMSC, LOGL_FATAL, "Failed to queue IPA/%d\n", proto);
 		msgb_free(msg);
@@ -274,7 +274,7 @@
 	/* initialize the networking. This includes sending a GSM08.08 message */
 	msg->cb[0] = (unsigned long) data;
 	if (hh->proto == IPAC_PROTO_IPACCESS) {
-		ipaccess_rcvmsg_base(msg, bfd);
+		ipa_ccm_rcvmsg_base(msg, bfd);
 		if (msg->l2h[0] == IPAC_MSGT_ID_ACK)
 			initialize_if_needed(data->msc_con);
 		else if (msg->l2h[0] == IPAC_MSGT_ID_GET) {
@@ -401,7 +401,7 @@
 	}
 
 	lac->nr_extra_lacs = lacs - 1;
-	ipaccess_prepend_header_ext(msg, IPAC_PROTO_EXT_LAC);
+	ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_LAC);
 	msc_queue_write(conn, msg, IPAC_PROTO_OSMO);
 }