diff --git a/stream/dap_stream.c b/stream/dap_stream.c
index 0017e663b55356603fa63af5e2ce58b94ab5d110..0cbf96a2be8faa0836b26d878f3bedb7c69edfc8 100644
--- a/stream/dap_stream.c
+++ b/stream/dap_stream.c
@@ -78,8 +78,8 @@ void stream_delete(dap_http_client_t * sh, void * arg);
 //struct ev_loop *keepalive_loop;
 pthread_t keepalive_thread;
 
-static dap_stream_t  *stream_keepalive_list = NULL;
-static pthread_mutex_t mutex_keepalive_list;
+static dap_stream_t  *s_stream_keepalive_list = NULL;
+static pthread_mutex_t s_mutex_keepalive_list;
 
 static void start_keepalive( dap_stream_t *sid );
 static void keepalive_cb( void );
@@ -127,7 +127,7 @@ int dap_stream_init( bool a_dump_packet_headers)
 
   bKeepaliveLoopQuitSignal = false;
 
-  pthread_mutex_init( &mutex_keepalive_list, NULL );
+  pthread_mutex_init( &s_mutex_keepalive_list, NULL );
   pthread_create( &keepalive_thread, NULL, stream_loop, NULL );
 
   log_it(L_NOTICE,"Init streaming module");
@@ -143,7 +143,7 @@ void dap_stream_deinit()
   bKeepaliveLoopQuitSignal = true;
   pthread_join( keepalive_thread, NULL );
 
-  pthread_mutex_destroy( &mutex_keepalive_list );
+  pthread_mutex_destroy( &s_mutex_keepalive_list );
 
   dap_stream_ch_deinit( );
 }
@@ -373,10 +373,10 @@ void dap_stream_delete( dap_stream_t *a_stream )
         dap_stream_session_close(a_stream->session->id);
     }
 
-    pthread_mutex_lock(&mutex_keepalive_list);
-    DL_DELETE(stream_keepalive_list, a_stream);
+    pthread_mutex_lock(&s_mutex_keepalive_list);
+    DL_DELETE(s_stream_keepalive_list, a_stream);
     stream_dap_delete(a_stream->conn, NULL);
-    pthread_mutex_unlock(&mutex_keepalive_list);
+    pthread_mutex_unlock(&s_mutex_keepalive_list);
     free(a_stream);
 }
 
@@ -442,23 +442,22 @@ static void keepalive_cb (EV_P_ ev_timer *w, int revents)
 
 static void keepalive_cb( void )
 {
-  dap_stream_t  *sid, *tmp;
+  dap_stream_t  *l_stream, *tmp;
 
-  pthread_mutex_lock( &mutex_keepalive_list );
-  DL_FOREACH_SAFE( stream_keepalive_list, sid, tmp ) {
-
-    if ( sid->keepalive_passed < STREAM_KEEPALIVE_PASSES ) {
-      dap_stream_send_keepalive( sid );
-      sid->keepalive_passed += 1;
+  pthread_mutex_lock( &s_mutex_keepalive_list );
+  DL_FOREACH_SAFE( s_stream_keepalive_list, l_stream, tmp ) {
+    if ( l_stream->keepalive_passed < STREAM_KEEPALIVE_PASSES ) {
+      dap_stream_send_keepalive( l_stream );
+      l_stream->keepalive_passed += 1;
     }
     else {
       log_it( L_INFO, "Client disconnected" );
-      DL_DELETE( stream_keepalive_list, sid );
-      stream_dap_delete( sid->conn, NULL );
+      DL_DELETE( s_stream_keepalive_list, l_stream );
+      stream_dap_delete( l_stream->conn, NULL );
     }
   }
 
-  pthread_mutex_unlock( &mutex_keepalive_list );
+  pthread_mutex_unlock( &s_mutex_keepalive_list );
 }
 
 
@@ -474,9 +473,9 @@ void start_keepalive( dap_stream_t *sid ) {
 //    sid->keepalive_watcher.data = sid;
 //    ev_timer_init (&sid->keepalive_watcher, keepalive_cb, STREAM_KEEPALIVE_TIMEOUT, STREAM_KEEPALIVE_TIMEOUT);
 //    ev_timer_start (keepalive_loop, &sid->keepalive_watcher);
-  pthread_mutex_lock( &mutex_keepalive_list );
-  DL_APPEND( stream_keepalive_list, sid );
-  pthread_mutex_unlock( &mutex_keepalive_list );
+  pthread_mutex_lock( &s_mutex_keepalive_list );
+  DL_APPEND( s_stream_keepalive_list, sid );
+  pthread_mutex_unlock( &s_mutex_keepalive_list );
 }
 
 /**