diff --git a/openbsc/include/openbsc/gsm_data.h b/openbsc/include/openbsc/gsm_data.h
index 4c87f83..66ef46c 100644
--- a/openbsc/include/openbsc/gsm_data.h
+++ b/openbsc/include/openbsc/gsm_data.h
@@ -849,7 +849,7 @@
 void subscr_con_free(struct gsm_subscriber_connection *conn);
 
 /* FIXME: this should go some other header file, but there is no good one */
-static inline void mncc_upq_enqueue(struct gsm_network *net, struct msgb *msg)
+static inline void cc_tx_to_mncc(struct gsm_network *net, struct msgb *msg)
 {
 	msgb_enqueue(&net->upqueue, msg);
 }
diff --git a/openbsc/src/gsm_04_08.c b/openbsc/src/gsm_04_08.c
index 637f84f..b91ce6a 100644
--- a/openbsc/src/gsm_04_08.c
+++ b/openbsc/src/gsm_04_08.c
@@ -1341,7 +1341,7 @@
 	if (!msg)
 		return -ENOMEM;
 	memcpy(msg->data, mncc, sizeof(struct gsm_mncc));
-	mncc_upq_enqueue(net, msg);
+	cc_tx_to_mncc(net, msg);
 
 	return 0;
 }
diff --git a/openbsc/src/rtp_proxy.c b/openbsc/src/rtp_proxy.c
index 21ec004..8d14447 100644
--- a/openbsc/src/rtp_proxy.c
+++ b/openbsc/src/rtp_proxy.c
@@ -442,7 +442,7 @@
 		if (rc < 0)
 			goto out_free;
 		msgb_free(msg);
-		mncc_upq_enqueue(rs->receive.net, new_msg);
+		cc_tx_to_mncc(rs->receive.net, new_msg);
 		break;
 
 	case RTP_NONE: /* if socket exists, but disabled by app */
diff --git a/openbsc/src/trau_mux.c b/openbsc/src/trau_mux.c
index 8b8c561..d521a62 100644
--- a/openbsc/src/trau_mux.c
+++ b/openbsc/src/trau_mux.c
@@ -213,7 +213,7 @@
 		}
 		frame->msg_type = GSM_TCHF_FRAME;
 		frame->callref = ue->callref;
-		mncc_upq_enqueue(ue->net, msg);
+		cc_tx_to_mncc(ue->net, msg);
 
 		return 0;
 	}