diff --git a/tests/mgcp_client/Makefile.am b/tests/mgcp_client/Makefile.am
index 2253770..e33f0e8 100644
--- a/tests/mgcp_client/Makefile.am
+++ b/tests/mgcp_client/Makefile.am
@@ -17,19 +17,19 @@
 	$(NULL)
 
 EXTRA_DIST = \
-	mgcpgw_client_test.ok \
-	mgcpgw_client_test.err \
+	mgcp_client_test.ok \
+	mgcp_client_test.err \
 	$(NULL)
 
 noinst_PROGRAMS = \
-	mgcpgw_client_test \
+	mgcp_client_test \
 	$(NULL)
 
-mgcpgw_client_test_SOURCES = \
-	mgcpgw_client_test.c \
+mgcp_client_test_SOURCES = \
+	mgcp_client_test.c \
 	$(NULL)
 
-mgcpgw_client_test_LDADD = \
+mgcp_client_test_LDADD = \
 	$(top_builddir)/src/libosmo-mgcp-client/libosmo-mgcp-client.la \
 	$(LIBOSMOCORE_LIBS) \
 	$(LIBOSMOVTY_LIBS) \
diff --git a/tests/mgcp_client/mgcpgw_client_test.c b/tests/mgcp_client/mgcp_client_test.c
similarity index 89%
rename from tests/mgcp_client/mgcpgw_client_test.c
rename to tests/mgcp_client/mgcp_client_test.c
index e90a4ed..6045297 100644
--- a/tests/mgcp_client/mgcpgw_client_test.c
+++ b/tests/mgcp_client/mgcp_client_test.c
@@ -23,8 +23,8 @@
 #include <osmocom/core/msgb.h>
 #include <osmocom/core/application.h>
 #include <osmocom/legacy_mgcp/mgcp.h>
-#include <osmocom/mgcp_client/mgcpgw_client.h>
-#include <osmocom/mgcp_client/mgcpgw_client_internal.h>
+#include <osmocom/mgcp_client/mgcp_client.h>
+#include <osmocom/mgcp_client/mgcp_client_internal.h>
 
 void *ctx;
 
@@ -71,8 +71,8 @@
 	return msg;
 }
 
-static struct mgcpgw_client_conf conf;
-struct mgcpgw_client *mgcp = NULL;
+static struct mgcp_client_conf conf;
+struct mgcp_client *mgcp = NULL;
 
 static void reply_to(mgcp_trans_id_t trans_id, int code, const char *comment,
 		     int conn_id, const char *params)
@@ -88,7 +88,7 @@
 
 	printf("composed response:\n-----\n%s\n-----\n",
 	       compose);
-	mgcpgw_client_rx(mgcp, from_str(compose));
+	mgcp_client_rx(mgcp, from_str(compose));
 }
 
 void test_response_cb(struct mgcp_response *response, void *priv)
@@ -114,7 +114,7 @@
 	trans_id = msg->cb[MSGB_CB_MGCP_TRANS_ID];
 	char *end;
 
-	OSMO_ASSERT(mgcpgw_client_pending_add(mgcp, trans_id, test_response_cb, mgcp));
+	OSMO_ASSERT(mgcp_client_pending_add(mgcp, trans_id, test_response_cb, mgcp));
 
 	end = (char*)msgb_put(msg, 1);
 	*end = '\0';
@@ -134,7 +134,7 @@
 
 	if (mgcp)
 		talloc_free(mgcp);
-	mgcp = mgcpgw_client_init(ctx, &conf);
+	mgcp = mgcp_client_init(ctx, &conf);
 
 	msg = mgcp_msg_crcx(mgcp, 23, 42, MGCP_CONN_LOOPBACK);
 	trans_id = dummy_mgcp_send(msg);
@@ -161,11 +161,11 @@
 
 int main(int argc, char **argv)
 {
-	ctx = talloc_named_const(NULL, 1, "mgcpgw_client_test");
+	ctx = talloc_named_const(NULL, 1, "mgcp_client_test");
 	msgb_talloc_ctx_init(ctx, 0);
 	osmo_init_logging(&log_info);
 
-	mgcpgw_client_conf_init(&conf);
+	mgcp_client_conf_init(&conf);
 
 	test_crcx();
 
diff --git a/tests/mgcp_client/mgcpgw_client_test.err b/tests/mgcp_client/mgcp_client_test.err
similarity index 100%
rename from tests/mgcp_client/mgcpgw_client_test.err
rename to tests/mgcp_client/mgcp_client_test.err
diff --git a/tests/mgcp_client/mgcpgw_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok
similarity index 100%
rename from tests/mgcp_client/mgcpgw_client_test.ok
rename to tests/mgcp_client/mgcp_client_test.ok