diff --git a/src/gsupclient/gsup_test_client.c b/src/gsupclient/gsup_test_client.c
index cfbd55e..b0362ad 100644
--- a/src/gsupclient/gsup_test_client.c
+++ b/src/gsupclient/gsup_test_client.c
@@ -13,7 +13,7 @@
 
 #include <osmocom/gsupclient/gsup_client.h>
 
-static struct gsup_client *g_gc;
+static struct osmo_gsup_client *g_gc;
 
 
 /***********************************************************************
@@ -117,7 +117,7 @@
 		return rc;
 	}
 
-	return gsup_client_send(g_gc, msg);
+	return osmo_gsup_client_send(g_gc, msg);
 }
 
 /* allocate + generate + send Send-Auth-Info */
@@ -137,7 +137,7 @@
 		return rc;
 	}
 
-	return gsup_client_send(g_gc, msg);
+	return osmo_gsup_client_send(g_gc, msg);
 }
 
 static int resp_isd(struct imsi_op *io)
@@ -157,7 +157,7 @@
 
 	imsi_op_release(io);
 
-	return gsup_client_send(g_gc, msg);
+	return osmo_gsup_client_send(g_gc, msg);
 }
 
 /* receive an incoming GSUP message */
@@ -214,7 +214,7 @@
 	}
 }
 
-static int gsupc_read_cb(struct gsup_client *gsupc, struct msgb *msg)
+static int gsupc_read_cb(struct osmo_gsup_client *gsupc, struct msgb *msg)
 {
 	struct osmo_gsup_message gsup_msg = {0};
 	struct imsi_op *io = NULL;
@@ -293,8 +293,8 @@
 
 	osmo_init_logging2(ctx, &gsup_test_client_log_info);
 
-	g_gc = gsup_client_create(ctx, "GSUPTEST", server_host, server_port,
-				  gsupc_read_cb, NULL);
+	g_gc = osmo_gsup_client_create(ctx, "GSUPTEST", server_host, server_port,
+					gsupc_read_cb, NULL);
 
 
 	signal(SIGINT, sig_cb);