diff --git a/src/gst/gstpinossink.c b/src/gst/gstpinossink.c
index 2253e2e0c..6e5a0968e 100644
--- a/src/gst/gstpinossink.c
+++ b/src/gst/gstpinossink.c
@@ -321,7 +321,7 @@ gst_pinos_sink_setcaps (GstBaseSink * bsink, GstCaps * caps)
   format = g_bytes_new_take (str, strlen (str) + 1);
 
   pinos_main_loop_lock (pinossink->loop);
-  pinossink->stream = pinos_stream_new (pinossink->ctx, "test", NULL);
+  pinossink->stream = pinos_stream_new (pinossink->ctx, pinossink->client_name, NULL);
   g_signal_connect (pinossink->stream, "notify::state", (GCallback) on_stream_notify, pinossink);
   g_signal_connect (pinossink->stream, "new-buffer", (GCallback) on_new_buffer, pinossink);
 
diff --git a/src/gst/gstpinossrc.c b/src/gst/gstpinossrc.c
index 06a62081c..61729d41a 100644
--- a/src/gst/gstpinossrc.c
+++ b/src/gst/gstpinossrc.c
@@ -766,7 +766,7 @@ gst_pinos_src_open (GstPinosSrc * pinossrc)
     pinos_main_loop_wait (pinossrc->loop);
   }
 
-  pinossrc->stream = pinos_stream_new (pinossrc->ctx, "test", NULL);
+  pinossrc->stream = pinos_stream_new (pinossrc->ctx, pinossrc->client_name, NULL);
   g_signal_connect (pinossrc->stream, "notify::state", (GCallback) on_stream_notify, pinossrc);
   g_signal_connect (pinossrc->stream, "new-buffer", (GCallback) on_new_buffer, pinossrc);
   pinos_main_loop_unlock (pinossrc->loop);