diff --git a/apps/efka/include/message.hrl b/apps/efka/include/message.hrl
index 611b098..d3f956a 100644
--- a/apps/efka/include/message.hrl
+++ b/apps/efka/include/message.hrl
@@ -85,7 +85,7 @@
     params :: binary()
 }).
 
--record(event_stream, {
+-record(task_event_stream, {
     task_id :: integer(),
     stream :: binary()
 }).
\ No newline at end of file
diff --git a/apps/efka/src/efka_remote_agent.erl b/apps/efka/src/efka_remote_agent.erl
index 5fdd9b0..8bbd275 100644
--- a/apps/efka/src/efka_remote_agent.erl
+++ b/apps/efka/src/efka_remote_agent.erl
@@ -125,7 +125,7 @@ handle_event(cast, {event, ServiceId, EventType, Params}, _, State) ->
     {keep_state, State};
 
 handle_event(cast, {task_event_stream, TaskId, Stream}, ?STATE_ACTIVATED, State = #state{transport_pid = TransportPid}) ->
-    EventPacket = message_codec:encode(?MESSAGE_EVENT_STREAM, #event_stream{
+    EventPacket = message_codec:encode(?MESSAGE_EVENT_STREAM, #task_event_stream{
         task_id = TaskId,
         stream = Stream
     }),
diff --git a/apps/efka/src/message/message_codec.erl b/apps/efka/src/message/message_codec.erl
index 4283b84..b8aa2bd 100644
--- a/apps/efka/src/message/message_codec.erl
+++ b/apps/efka/src/message/message_codec.erl
@@ -67,7 +67,7 @@ encode0(#event{service_id = ServiceId, event_type = EventType, params = Params})
         marshal(?I32, EventType),
         marshal(?Bytes, Params)
     ]);
-encode0(#event_stream{task_id = TaskId, stream = Stream}) ->
+encode0(#task_event_stream{task_id = TaskId, stream = Stream}) ->
     iolist_to_binary([
         marshal(?Bytes, TaskId),
         marshal(?I32, Stream)
@@ -98,7 +98,7 @@ decode0(?MESSAGE_DATA, [ServiceId, DeviceUUID, RouteKey, Metric]) ->
 decode0(?MESSAGE_EVENT, [ServiceId, EventType, Params]) ->
     {ok, #event{service_id = ServiceId, event_type = EventType, params = Params}};
 decode0(?MESSAGE_EVENT_STREAM, [TaskId, Stream]) ->
-    {ok, #event_stream{task_id = TaskId, stream = Stream}};
+    {ok, #task_event_stream{task_id = TaskId, stream = Stream}};
 decode0(_, _) ->
     error.