diff --git a/dap_stream_ch.c b/dap_stream_ch.c
index 160e8e70eecaa4b39829c91553a0619697186530..bf3ecf568259204d84729ecdab1c5d880fd5bd76 100644
--- a/dap_stream_ch.c
+++ b/dap_stream_ch.c
@@ -34,7 +34,7 @@
  * @brief stream_ch_init Init stream channel module
  * @return Zero if ok others if no
  */
-int stream_ch_init()
+int dap_stream_ch_init()
 {
     if(stream_ch_proc_init() != 0 ){
         log_it(L_CRITICAL,"Can't init stream channel proc submodule");
@@ -51,7 +51,7 @@ int stream_ch_init()
 /**
  * @brief stream_ch_deinit Destroy stream channel submodule
  */
-void stream_ch_deinit()
+void dap_stream_ch_deinit()
 {
 }
 
@@ -60,7 +60,7 @@ void stream_ch_deinit()
  * @param direction Direction of channel (input to the server, output to the client)
  * @return
  */
-dap_stream_ch_t* stream_ch_new(struct stream* stream,uint8_t id)
+dap_stream_ch_t* dap_stream_ch_new(dap_stream_t* stream,uint8_t id)
 {
     stream_ch_proc_t * proc=stream_ch_proc_find(id);
     if(proc){
@@ -84,7 +84,7 @@ dap_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(dap_stream_ch_t*ch)
+void dap_stream_ch_delete(dap_stream_ch_t*ch)
 {
     if(ch->proc)
         if(ch->proc->delete_callback)
@@ -99,7 +99,7 @@ void stream_ch_delete(dap_stream_ch_t*ch)
 }
 
 
-void stream_ch_set_ready_to_write(dap_stream_ch_t * ch,bool is_ready)
+void dap_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){
diff --git a/dap_stream_ch.h b/dap_stream_ch.h
index cb90436fa6a97e5ce5374f2dfde3c82d141fbd2a..a884ed38fb84d7af29e340f8394cf3280d678bbd 100644
--- a/dap_stream_ch.h
+++ b/dap_stream_ch.h
@@ -24,21 +24,21 @@
 #include <pthread.h>
 #include <stdint.h>
 
-struct stream;
-struct stream_pkt;
-struct stream_ch_proc;
-struct stream_ch;
+typedef struct dap_stream dap_stream_t;
+typedef struct dap_stream_pkt dap_stream_pkt_t;
+typedef struct dap_stream_ch_proc dap_stream_ch_proc_t;
+typedef struct dap_stream_ch dap_stream_ch_t;
 
 #define SERVICE_CHANNEL_ID 's'
 #define DATA_CHANNEL_ID 'd'
 
-typedef void (*stream_ch_callback_t) (struct stream_ch*,void*);
+typedef void (*dap_stream_ch_callback_t) (dap_stream_ch_t*,void*);
 
-typedef struct stream_ch{
+typedef struct dap_stream_ch{
     pthread_mutex_t mutex;
     bool ready_to_write;
     bool ready_to_read;
-    struct stream * stream;
+    dap_stream_t * stream;
 
     struct{
         uint64_t bytes_write;
@@ -47,17 +47,17 @@ typedef struct stream_ch{
 
     uint8_t buf[500000];
 
-    struct stream_ch_proc * proc;
-    void * internal;  // Internal structure, GStreamer for example
+    dap_stream_ch_proc_t * proc;
+    void * internal;
 } dap_stream_ch_t;
 
-extern int stream_ch_init();
-extern void stream_ch_deinit();
+int dap_stream_ch_init();
+void dap_stream_ch_deinit();
 
-extern dap_stream_ch_t* stream_ch_new(struct stream*stream,uint8_t id);
+dap_stream_ch_t* dap_stream_ch_new( dap_stream_t * dap_stream,uint8_t id);
 
-extern void stream_ch_set_ready_to_write(dap_stream_ch_t * ch,bool is_ready);
+void dap_stream_ch_set_ready_to_write(dap_stream_ch_t * ch,bool is_ready);
 
-extern void stream_ch_delete(dap_stream_ch_t*ch);
+void dap_stream_ch_delete(dap_stream_ch_t*ch);
 
 #endif
diff --git a/dap_stream_ch_pkt.c b/dap_stream_ch_pkt.c
index 79438d7493aa762f3852a1b9e47d55bb71da4797..7f41fec5a54da5fc0d8c8ffb66aead6dbe34ed72 100644
--- a/dap_stream_ch_pkt.c
+++ b/dap_stream_ch_pkt.c
@@ -57,7 +57,7 @@ void stream_ch_pkt_deinit()
  * @param data_size
  * @return
  */
-size_t stream_ch_pkt_write_seq_id(struct stream_ch * ch, uint8_t type, uint64_t seq_id, const void * data, uint32_t data_size)
+size_t stream_ch_pkt_write_seq_id(struct dap_stream_ch * ch, uint8_t type, uint64_t seq_id, const void * data, uint32_t data_size)
 {
     pthread_mutex_lock( &ch->mutex);
 
@@ -93,7 +93,7 @@ size_t stream_ch_pkt_write_seq_id(struct stream_ch * ch, uint8_t type, uint64_t
  * @param data_size
  * @return
  */
-size_t stream_ch_pkt_write(struct stream_ch * ch, uint8_t type, const void * data, uint32_t data_size)
+size_t stream_ch_pkt_write(struct dap_stream_ch * ch, uint8_t type, const void * data, uint32_t data_size)
 {
     return stream_ch_pkt_write_seq_id(ch,type,0,data,data_size);
 }
@@ -104,7 +104,7 @@ size_t stream_ch_pkt_write(struct stream_ch * ch, uint8_t type, const void * dat
  * @param str
  * @return
  */
-size_t stream_ch_pkt_write_f(struct stream_ch * ch, uint8_t type, const char * str,...)
+size_t stream_ch_pkt_write_f(struct dap_stream_ch * ch, uint8_t type, const char * str,...)
 {
     char buf[4096];
     va_list ap;
@@ -120,7 +120,7 @@ size_t stream_ch_pkt_write_f(struct stream_ch * ch, uint8_t type, const char * s
  * @param ch
  * @return
  */
-size_t stream_ch_send_keepalive(struct stream_ch * ch){
+size_t stream_ch_send_keepalive(struct dap_stream_ch * ch){
     pthread_mutex_lock( &ch->mutex);
 
     stream_ch_pkt_hdr_t hdr;
diff --git a/dap_stream_ch_pkt.h b/dap_stream_ch_pkt.h
index 4e8fcb0b8290a181d9ee581627de10249f3dff4d..1502e4700244dd70a2d1108dbfbe7b4018c9ef05 100644
--- a/dap_stream_ch_pkt.h
+++ b/dap_stream_ch_pkt.h
@@ -26,7 +26,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-struct stream_ch;
+struct dap_stream_ch;
 typedef struct stream_ch_pkt_hdr{
     uint8_t id;   // Channel id
     uint8_t enc_type; // Zero if not encrypted
@@ -45,10 +45,10 @@ typedef struct stream_ch_pkt{
 extern int stream_ch_pkt_init();
 extern void stream_ch_pkt_deinit();
 
-extern size_t stream_ch_pkt_write_f(struct stream_ch * ch, uint8_t type, const char * str,...);
-extern size_t stream_ch_pkt_write(struct stream_ch * ch,  uint8_t type, const void * data, uint32_t data_size);
-extern size_t stream_ch_pkt_write_seq_id(struct stream_ch * ch,  uint8_t type, uint64_t seq_id, const void * data, uint32_t data_size);
+extern size_t stream_ch_pkt_write_f(struct dap_stream_ch * ch, uint8_t type, const char * str,...);
+extern size_t stream_ch_pkt_write(struct dap_stream_ch * ch,  uint8_t type, const void * data, uint32_t data_size);
+extern size_t stream_ch_pkt_write_seq_id(struct dap_stream_ch * ch,  uint8_t type, uint64_t seq_id, const void * data, uint32_t data_size);
 
-extern size_t stream_ch_send_keepalive(struct stream_ch * ch);
+extern size_t stream_ch_send_keepalive(struct dap_stream_ch * ch);
 
 #endif
diff --git a/dap_stream_ch_proc.c b/dap_stream_ch_proc.c
index 62cc49f5442250424796c38b1d852a7ccc94abb5..c88684507582579e0f521fae369c8f4be4ecc75e 100644
--- a/dap_stream_ch_proc.c
+++ b/dap_stream_ch_proc.c
@@ -49,9 +49,9 @@ void stream_ch_proc_deinit()
  * @param packet_in_callback
  * @param packet_out_callback
  */
-void stream_ch_proc_add(uint8_t id,stream_ch_callback_t new_callback,stream_ch_callback_t delete_callback,
-                          stream_ch_callback_t packet_in_callback,
-                          stream_ch_callback_t packet_out_callback
+void stream_ch_proc_add(uint8_t id,dap_stream_ch_callback_t new_callback,dap_stream_ch_callback_t delete_callback,
+                          dap_stream_ch_callback_t packet_in_callback,
+                          dap_stream_ch_callback_t packet_out_callback
                           )
 {
    proc[id].id=id;
diff --git a/dap_stream_ch_proc.h b/dap_stream_ch_proc.h
index 9223f470f72d6128251f15c1104f684ec3064801..041ffb25bb8703bdd81b68ceade0a4371f22cd45 100644
--- a/dap_stream_ch_proc.h
+++ b/dap_stream_ch_proc.h
@@ -25,15 +25,15 @@
 #include "dap_stream_ch.h"
 
 
-typedef struct stream_ch_proc{
+typedef struct dap_stream_ch_proc{
     uint8_t id; // Channel type id
     uint8_t enc_type; // Encryption type
 
-    stream_ch_callback_t new_callback;
-    stream_ch_callback_t delete_callback;
+    dap_stream_ch_callback_t new_callback;
+    dap_stream_ch_callback_t delete_callback;
 
-    stream_ch_callback_t packet_in_callback;
-    stream_ch_callback_t packet_out_callback;
+    dap_stream_ch_callback_t packet_in_callback;
+    dap_stream_ch_callback_t packet_out_callback;
     void * internal;
 } stream_ch_proc_t;
 
@@ -41,9 +41,9 @@ extern int stream_ch_proc_init();
 extern void stream_ch_proc_deinit();
 
 extern void stream_ch_proc_add(uint8_t id,
-                          stream_ch_callback_t new_callback, stream_ch_callback_t delete_callback,
-                          stream_ch_callback_t packet_in_callback,
-                          stream_ch_callback_t packet_out_callback
+                          dap_stream_ch_callback_t new_callback, dap_stream_ch_callback_t delete_callback,
+                          dap_stream_ch_callback_t packet_in_callback,
+                          dap_stream_ch_callback_t packet_out_callback
                           );
 extern stream_ch_proc_t* stream_ch_proc_find(uint8_t id);