diff --git a/pinos/client/context.c b/pinos/client/context.c
index 40eafe325..ef55454e3 100644
--- a/pinos/client/context.c
+++ b/pinos/client/context.c
@@ -384,8 +384,7 @@ on_daemon_connected (GObject      *source_object,
 {
   PinosContext *context = user_data;
 
-  context_set_state (context, PINOS_CONTEXT_STATE_REGISTERING, NULL);
-  context_set_state (context, PINOS_CONTEXT_STATE_READY, NULL);
+  context_set_state (context, PINOS_CONTEXT_STATE_CONNECTED, NULL);
 }
 
 static void
@@ -646,7 +645,7 @@ on_node_proxy (GObject      *source_object,
   PinosContext *context = g_task_get_source_object (task);
   GError *error = NULL;
   GDBusProxy *proxy;
-  PinosNode *node;
+  PinosClientNode *node;
 
   proxy = pinos_subscribe_get_proxy_finish (context->priv->subscribe,
                                             res,
diff --git a/pinos/client/context.h b/pinos/client/context.h
index 83ff7c65c..e84a6a166 100644
--- a/pinos/client/context.h
+++ b/pinos/client/context.h
@@ -60,11 +60,10 @@ typedef enum {
 
 /**
  * PinosContextState:
+ * @PINOS_CONTEXT_STATE_ERROR: context is in error
  * @PINOS_CONTEXT_STATE_UNCONNECTED: not connected
  * @PINOS_CONTEXT_STATE_CONNECTING: connecting to daemon
- * @PINOS_CONTEXT_STATE_REGISTERING: registering with daemon
- * @PINOS_CONTEXT_STATE_READY: context is ready
- * @PINOS_CONTEXT_STATE_ERROR: context is in error
+ * @PINOS_CONTEXT_STATE_CONNECTED: context is connected and ready
  *
  * The state of a #PinosContext
  */
@@ -72,8 +71,7 @@ typedef enum {
   PINOS_CONTEXT_STATE_ERROR        = -1,
   PINOS_CONTEXT_STATE_UNCONNECTED  = 0,
   PINOS_CONTEXT_STATE_CONNECTING   = 1,
-  PINOS_CONTEXT_STATE_REGISTERING  = 2,
-  PINOS_CONTEXT_STATE_READY        = 3,
+  PINOS_CONTEXT_STATE_CONNECTED    = 2,
 } PinosContextState;
 
 const gchar * pinos_context_state_as_string (PinosContextState state);
diff --git a/pinos/client/stream.c b/pinos/client/stream.c
index d2c36bbab..2af54a867 100644
--- a/pinos/client/stream.c
+++ b/pinos/client/stream.c
@@ -616,7 +616,7 @@ pinos_stream_connect (PinosStream      *stream,
 
   priv = stream->priv;
   context = priv->context;
-  g_return_val_if_fail (pinos_context_get_state (context) == PINOS_CONTEXT_STATE_READY, FALSE);
+  g_return_val_if_fail (pinos_context_get_state (context) == PINOS_CONTEXT_STATE_CONNECTED, FALSE);
   g_return_val_if_fail (pinos_stream_get_state (stream) == PINOS_STREAM_STATE_UNCONNECTED, FALSE);
 
   priv->direction = direction;
@@ -681,7 +681,7 @@ pinos_stream_connect_provide (PinosStream      *stream,
 
   priv = stream->priv;
   context = priv->context;
-  g_return_val_if_fail (pinos_context_get_state (context) == PINOS_CONTEXT_STATE_READY, FALSE);
+  g_return_val_if_fail (pinos_context_get_state (context) == PINOS_CONTEXT_STATE_CONNECTED, FALSE);
 
   if (priv->possible_formats)
     g_bytes_unref (priv->possible_formats);
@@ -810,7 +810,7 @@ pinos_stream_disconnect (PinosStream *stream)
   g_return_val_if_fail (priv->state >= PINOS_STREAM_STATE_READY, FALSE);
   g_return_val_if_fail (priv->node != NULL, FALSE);
   context = priv->context;
-  g_return_val_if_fail (pinos_context_get_state (context) >= PINOS_CONTEXT_STATE_READY, FALSE);
+  g_return_val_if_fail (pinos_context_get_state (context) >= PINOS_CONTEXT_STATE_CONNECTED, FALSE);
   g_return_val_if_fail (!priv->disconnecting, FALSE);
 
   priv->disconnecting = TRUE;
diff --git a/pinos/gst/gstpinosdeviceprovider.c b/pinos/gst/gstpinosdeviceprovider.c
index cfaf95d27..32ec0949c 100644
--- a/pinos/gst/gstpinosdeviceprovider.c
+++ b/pinos/gst/gstpinosdeviceprovider.c
@@ -380,7 +380,7 @@ gst_pinos_device_provider_probe (GstDeviceProvider * provider)
       goto failed;
     }
 
-    if (state == PINOS_CONTEXT_STATE_READY)
+    if (state == PINOS_CONTEXT_STATE_CONNECTED)
       break;
 
     /* Wait until something happens */
@@ -442,10 +442,9 @@ context_state_notify (GObject    *gobject,
 
   switch (state) {
     case PINOS_CONTEXT_STATE_CONNECTING:
-    case PINOS_CONTEXT_STATE_REGISTERING:
       break;
     case PINOS_CONTEXT_STATE_UNCONNECTED:
-    case PINOS_CONTEXT_STATE_READY:
+    case PINOS_CONTEXT_STATE_CONNECTED:
       break;
     case PINOS_CONTEXT_STATE_ERROR:
       GST_ERROR_OBJECT (self, "context error: %s",
@@ -512,7 +511,7 @@ gst_pinos_device_provider_start (GstDeviceProvider * provider)
       goto not_running;
     }
 
-    if (state == PINOS_CONTEXT_STATE_READY)
+    if (state == PINOS_CONTEXT_STATE_CONNECTED)
       break;
 
     /* Wait until something happens */
diff --git a/pinos/gst/gstpinossink.c b/pinos/gst/gstpinossink.c
index ab56f6dc6..cdc4c72d2 100644
--- a/pinos/gst/gstpinossink.c
+++ b/pinos/gst/gstpinossink.c
@@ -673,8 +673,7 @@ on_context_notify (GObject    *gobject,
   switch (state) {
     case PINOS_CONTEXT_STATE_UNCONNECTED:
     case PINOS_CONTEXT_STATE_CONNECTING:
-    case PINOS_CONTEXT_STATE_REGISTERING:
-    case PINOS_CONTEXT_STATE_READY:
+    case PINOS_CONTEXT_STATE_CONNECTED:
       break;
     case PINOS_CONTEXT_STATE_ERROR:
       GST_ELEMENT_ERROR (pinossink, RESOURCE, FAILED,
@@ -706,7 +705,7 @@ gst_pinos_sink_open (GstPinosSink * pinossink)
   while (TRUE) {
     PinosContextState state = pinos_context_get_state (pinossink->ctx);
 
-    if (state == PINOS_CONTEXT_STATE_READY)
+    if (state == PINOS_CONTEXT_STATE_CONNECTED)
       break;
 
     if (state == PINOS_CONTEXT_STATE_ERROR)
diff --git a/pinos/gst/gstpinossrc.c b/pinos/gst/gstpinossrc.c
index 8a2939086..98333b1ac 100644
--- a/pinos/gst/gstpinossrc.c
+++ b/pinos/gst/gstpinossrc.c
@@ -906,8 +906,7 @@ on_context_notify (GObject    *gobject,
   switch (state) {
     case PINOS_CONTEXT_STATE_UNCONNECTED:
     case PINOS_CONTEXT_STATE_CONNECTING:
-    case PINOS_CONTEXT_STATE_REGISTERING:
-    case PINOS_CONTEXT_STATE_READY:
+    case PINOS_CONTEXT_STATE_CONNECTED:
       break;
     case PINOS_CONTEXT_STATE_ERROR:
       GST_ELEMENT_ERROR (pinossrc, RESOURCE, FAILED,
@@ -954,7 +953,7 @@ gst_pinos_src_open (GstPinosSrc * pinossrc)
   while (TRUE) {
     PinosContextState state = pinos_context_get_state (pinossrc->ctx);
 
-    if (state == PINOS_CONTEXT_STATE_READY)
+    if (state == PINOS_CONTEXT_STATE_CONNECTED)
       break;
 
     if (state == PINOS_CONTEXT_STATE_ERROR)
diff --git a/pinos/tests/test-client.c b/pinos/tests/test-client.c
index 66fd9ec45..201cbd940 100644
--- a/pinos/tests/test-client.c
+++ b/pinos/tests/test-client.c
@@ -133,7 +133,7 @@ on_state_notify (GObject    *gobject,
     case PINOS_CONTEXT_STATE_ERROR:
       g_main_loop_quit (loop);
       break;
-    case PINOS_CONTEXT_STATE_READY:
+    case PINOS_CONTEXT_STATE_CONNECTED:
     {
       PinosStream *stream;
       GBytes *format;