diff --git a/monkey/common/event_queue/__init__.py b/monkey/common/event_queue/__init__.py
index f88abe300..1d2c0e5fc 100644
--- a/monkey/common/event_queue/__init__.py
+++ b/monkey/common/event_queue/__init__.py
@@ -1,3 +1,3 @@
 from .types import EventSubscriber
-from .i_event_queue import IEventQueue
+from .i_event_queue import IAgentEventQueue
 from .pypubsub_event_queue import PyPubSubEventQueue
diff --git a/monkey/common/event_queue/i_event_queue.py b/monkey/common/event_queue/i_event_queue.py
index 128d0517b..15e35e75a 100644
--- a/monkey/common/event_queue/i_event_queue.py
+++ b/monkey/common/event_queue/i_event_queue.py
@@ -6,7 +6,7 @@ from common.events import AbstractAgentEvent
 from . import EventSubscriber
 
 
-class IEventQueue(ABC):
+class IAgentEventQueue(ABC):
     """
     Manages subscription and publishing of events
     """
diff --git a/monkey/common/event_queue/pypubsub_event_queue.py b/monkey/common/event_queue/pypubsub_event_queue.py
index 9c3e4dc6d..b189d8fdf 100644
--- a/monkey/common/event_queue/pypubsub_event_queue.py
+++ b/monkey/common/event_queue/pypubsub_event_queue.py
@@ -5,14 +5,14 @@ from pubsub.core import Publisher
 
 from common.events import AbstractAgentEvent
 
-from . import EventSubscriber, IEventQueue
+from . import EventSubscriber, IAgentEventQueue
 
 _ALL_EVENTS_TOPIC = "all_events_topic"
 
 logger = logging.getLogger(__name__)
 
 
-class PyPubSubEventQueue(IEventQueue):
+class PyPubSubEventQueue(IAgentEventQueue):
     def __init__(self, pypubsub_publisher: Publisher):
         self._pypubsub_publisher = pypubsub_publisher
         self._refs = []