diff --git a/dap_stream_ch.c b/dap_stream_ch.c
index a653f31fa1e6d04b444c53ae94aa5f216e9b4d7b..160e8e70eecaa4b39829c91553a0619697186530 100644
--- a/dap_stream_ch.c
+++ b/dap_stream_ch.c
@@ -20,7 +20,7 @@
 
 #include "dap_common.h"
 
-#include "dap_server_client.h"
+#include "dap_client_remote.h"
 #include "dap_http_client.h"
 
 #include "stream.h"
@@ -60,11 +60,11 @@ void stream_ch_deinit()
  * @param direction Direction of channel (input to the server, output to the client)
  * @return
  */
-stream_ch_t* stream_ch_new(struct stream* stream,uint8_t id)
+dap_stream_ch_t* stream_ch_new(struct stream* stream,uint8_t id)
 {
     stream_ch_proc_t * proc=stream_ch_proc_find(id);
     if(proc){
-        stream_ch_t * ret= DAP_NEW_Z(stream_ch_t);
+        dap_stream_ch_t * ret= DAP_NEW_Z(dap_stream_ch_t);
         ret->stream=stream;
         ret->proc=proc;
         ret->ready_to_read=true;
@@ -84,7 +84,7 @@ stream_ch_t* stream_ch_new(struct stream* stream,uint8_t id)
  * @brief stream_ch_delete Delete channel instance
  * @param ch Channel delete
  */
-void stream_ch_delete(stream_ch_t*ch)
+void stream_ch_delete(dap_stream_ch_t*ch)
 {
     if(ch->proc)
         if(ch->proc->delete_callback)
@@ -99,7 +99,7 @@ void stream_ch_delete(stream_ch_t*ch)
 }
 
 
-void stream_ch_set_ready_to_write(stream_ch_t * ch,bool is_ready)
+void stream_ch_set_ready_to_write(dap_stream_ch_t * ch,bool is_ready)
 {
     pthread_mutex_lock(&ch->mutex);
     if(ch->ready_to_write!=is_ready){
@@ -110,7 +110,7 @@ void stream_ch_set_ready_to_write(stream_ch_t * ch,bool is_ready)
         if(ch->stream->conn_udp)
             dap_udp_client_ready_to_write(ch->stream->conn,is_ready);
         else
-            dap_client_ready_to_write(ch->stream->conn,is_ready);
+            dap_client_remote_ready_to_write(ch->stream->conn,is_ready);
     }
     pthread_mutex_unlock(&ch->mutex);
 }
diff --git a/dap_stream_ch.h b/dap_stream_ch.h
index 91c50adfddfb7b09bfef221036dfd1727598b8ba..cb90436fa6a97e5ce5374f2dfde3c82d141fbd2a 100644
--- a/dap_stream_ch.h
+++ b/dap_stream_ch.h
@@ -49,15 +49,15 @@ typedef struct stream_ch{
 
     struct stream_ch_proc * proc;
     void * internal;  // Internal structure, GStreamer for example
-} stream_ch_t;
+} dap_stream_ch_t;
 
 extern int stream_ch_init();
 extern void stream_ch_deinit();
 
-extern stream_ch_t* stream_ch_new(struct stream*stream,uint8_t id);
+extern dap_stream_ch_t* stream_ch_new(struct stream*stream,uint8_t id);
 
-extern void stream_ch_set_ready_to_write(stream_ch_t * ch,bool is_ready);
+extern void stream_ch_set_ready_to_write(dap_stream_ch_t * ch,bool is_ready);
 
-extern void stream_ch_delete(stream_ch_t*ch);
+extern void stream_ch_delete(dap_stream_ch_t*ch);
 
 #endif
diff --git a/dap_stream_ch_pkt.c b/dap_stream_ch_pkt.c
index 4cb609fb3a0e30c8e29e079d572ff99f1cf9d109..79438d7493aa762f3852a1b9e47d55bb71da4797 100644
--- a/dap_stream_ch_pkt.c
+++ b/dap_stream_ch_pkt.c
@@ -25,7 +25,7 @@
 #include "dap_enc.h"
 #include "dap_enc_key.h"
 
-#include "dap_server_client.h"
+#include "dap_client_remote.h"
 #include "stream.h"
 #include "dap_stream_ch.h"
 #include "dap_stream_ch_pkt.h"