diff --git a/openbsc/src/gprs/sgsn_main.c b/openbsc/src/gprs/sgsn_main.c
index c3bc8d2..d1df094 100644
--- a/openbsc/src/gprs/sgsn_main.c
+++ b/openbsc/src/gprs/sgsn_main.c
@@ -88,7 +88,7 @@
 	switch (event) {
 	case GPRS_NS_EVT_UNIT_DATA:
 		/* hand the message into the BSSGP implementation */
-		rc = gprs_bssgp_rcvmsg(msg);
+		rc = bssgp_rcvmsg(msg);
 		break;
 	default:
 		LOGP(DGPRS, LOGL_ERROR, "SGSN: Unknown event %u from NS\n", event);
@@ -320,7 +320,7 @@
 		exit(1);
 
 	gprs_ns_set_log_ss(DNS);
-	gprs_bssgp_set_log_ss(DBSSGP);
+	bssgp_set_log_ss(DBSSGP);
 
 	sgsn_nsi = gprs_ns_instantiate(&sgsn_ns_cb, tall_bsc_ctx);
 	if (!sgsn_nsi) {
@@ -332,7 +332,7 @@
 	gprs_llc_init("/usr/local/lib/osmocom/crypt/");
 
 	gprs_ns_vty_init(bssgp_nsi);
-	gprs_bssgp_vty_init();
+	bssgp_vty_init();
 	gprs_llc_vty_init();
 	gprs_sndcp_vty_init();
 	/* FIXME: register signal handler for SS_L_NS */