diff --git a/src/gst/gstpinossink.c b/src/gst/gstpinossink.c
index cd80ce4fd..80958aa36 100644
--- a/src/gst/gstpinossink.c
+++ b/src/gst/gstpinossink.c
@@ -463,7 +463,7 @@ gst_pinos_sink_open (GstPinosSink * pinossink)
     goto mainloop_error;
 
   pinos_main_loop_lock (pinossink->loop);
-  pinossink->ctx = pinos_context_new (pinossink->context, "test-client", NULL);
+  pinossink->ctx = pinos_context_new (pinossink->context, g_get_application_name (), NULL);
   g_signal_connect (pinossink->ctx, "notify::state", (GCallback) on_context_notify, pinossink);
 
   pinos_context_connect(pinossink->ctx, PINOS_CONTEXT_FLAGS_NONE);
diff --git a/src/gst/gstpinossrc.c b/src/gst/gstpinossrc.c
index 5883aba2b..596a35b03 100644
--- a/src/gst/gstpinossrc.c
+++ b/src/gst/gstpinossrc.c
@@ -606,7 +606,7 @@ gst_pinos_src_open (GstPinosSrc * pinossrc)
     goto mainloop_failed;
 
   pinos_main_loop_lock (pinossrc->loop);
-  pinossrc->ctx = pinos_context_new (pinossrc->context, "test-client", NULL);
+  pinossrc->ctx = pinos_context_new (pinossrc->context, g_get_application_name (), NULL);
   g_signal_connect (pinossrc->ctx, "notify::state", (GCallback) on_context_notify, pinossrc);
 
   pinos_context_connect (pinossrc->ctx, PINOS_CONTEXT_FLAGS_NONE);
diff --git a/src/tools/pinos-monitor.c b/src/tools/pinos-monitor.c
index b447cc042..d409b841d 100644
--- a/src/tools/pinos-monitor.c
+++ b/src/tools/pinos-monitor.c
@@ -257,7 +257,7 @@ main (gint argc, gchar *argv[])
 
   loop = g_main_loop_new (NULL, FALSE);
 
-  c = pinos_context_new (NULL, "test-client", NULL);
+  c = pinos_context_new (NULL, "pinos-monitor", NULL);
   g_signal_connect (c, "notify::state", (GCallback) on_state_notify, c);
   g_object_set (c, "subscription-mask", PINOS_SUBSCRIPTION_FLAGS_ALL, NULL);
   g_signal_connect (c, "subscription-event", (GCallback) subscription_cb, NULL);