diff --git a/monkey/infection_monkey/credential_collectors/mimikatz_collector/mimikatz_credential_collector.py b/monkey/infection_monkey/credential_collectors/mimikatz_collector/mimikatz_credential_collector.py
index a39023e0e..882ced8ca 100644
--- a/monkey/infection_monkey/credential_collectors/mimikatz_collector/mimikatz_credential_collector.py
+++ b/monkey/infection_monkey/credential_collectors/mimikatz_collector/mimikatz_credential_collector.py
@@ -2,7 +2,7 @@ import logging
 from typing import Sequence
 
 from common.credentials import Credentials, LMHash, NTHash, Password, Username
-from common.event_queue import IEventQueue
+from common.event_queue import IAgentEventQueue
 from common.events import CredentialsStolenEvent
 from infection_monkey.i_puppet import ICredentialCollector
 from infection_monkey.model import USERNAME_PREFIX
@@ -27,7 +27,7 @@ MIMIKATZ_EVENT_TAGS = frozenset(
 
 
 class MimikatzCredentialCollector(ICredentialCollector):
-    def __init__(self, event_queue: IEventQueue):
+    def __init__(self, event_queue: IAgentEventQueue):
         self._event_queue = event_queue
 
     def collect_credentials(self, options=None) -> Sequence[Credentials]:
diff --git a/monkey/infection_monkey/credential_collectors/ssh_collector/ssh_credential_collector.py b/monkey/infection_monkey/credential_collectors/ssh_collector/ssh_credential_collector.py
index b696adf40..ed0fc1a8e 100644
--- a/monkey/infection_monkey/credential_collectors/ssh_collector/ssh_credential_collector.py
+++ b/monkey/infection_monkey/credential_collectors/ssh_collector/ssh_credential_collector.py
@@ -2,7 +2,7 @@ import logging
 from typing import Sequence
 
 from common.credentials import Credentials
-from common.event_queue import IEventQueue
+from common.event_queue import IAgentEventQueue
 from infection_monkey.credential_collectors.ssh_collector import ssh_handler
 from infection_monkey.i_puppet import ICredentialCollector
 from infection_monkey.telemetry.messengers.i_telemetry_messenger import ITelemetryMessenger
@@ -15,7 +15,7 @@ class SSHCredentialCollector(ICredentialCollector):
     SSH keys credential collector
     """
 
-    def __init__(self, telemetry_messenger: ITelemetryMessenger, event_queue: IEventQueue):
+    def __init__(self, telemetry_messenger: ITelemetryMessenger, event_queue: IAgentEventQueue):
         self._telemetry_messenger = telemetry_messenger
         self._event_queue = event_queue
 
diff --git a/monkey/infection_monkey/credential_collectors/ssh_collector/ssh_handler.py b/monkey/infection_monkey/credential_collectors/ssh_collector/ssh_handler.py
index 7d8a046f4..ca271a5d8 100644
--- a/monkey/infection_monkey/credential_collectors/ssh_collector/ssh_handler.py
+++ b/monkey/infection_monkey/credential_collectors/ssh_collector/ssh_handler.py
@@ -4,7 +4,7 @@ import os
 from typing import Dict, Iterable, Sequence
 
 from common.credentials import Credentials, SSHKeypair, Username
-from common.event_queue import IEventQueue
+from common.event_queue import IAgentEventQueue
 from common.events import CredentialsStolenEvent
 from common.utils.attack_utils import ScanStatus
 from infection_monkey.telemetry.attack.t1005_telem import T1005Telem
@@ -31,7 +31,7 @@ SSH_COLLECTOR_EVENT_TAGS = frozenset(
 
 
 def get_ssh_info(
-    telemetry_messenger: ITelemetryMessenger, event_queue: IEventQueue
+    telemetry_messenger: ITelemetryMessenger, event_queue: IAgentEventQueue
 ) -> Iterable[Dict]:
     # TODO: Remove this check when this is turned into a plugin.
     if is_windows_os():
@@ -80,7 +80,9 @@ def _get_ssh_struct(name: str, home_dir: str) -> Dict:
 
 
 def _get_ssh_files(
-    user_info: Iterable[Dict], telemetry_messenger: ITelemetryMessenger, event_queue: IEventQueue
+    user_info: Iterable[Dict],
+    telemetry_messenger: ITelemetryMessenger,
+    event_queue: IAgentEventQueue,
 ) -> Iterable[Dict]:
     for info in user_info:
         path = info["home_dir"]
@@ -165,7 +167,9 @@ def to_credentials(ssh_info: Iterable[Dict]) -> Sequence[Credentials]:
     return ssh_credentials
 
 
-def _publish_credentials_stolen_event(collected_credentials: Credentials, event_queue: IEventQueue):
+def _publish_credentials_stolen_event(
+    collected_credentials: Credentials, event_queue: IAgentEventQueue
+):
     credentials_stolen_event = CredentialsStolenEvent(
         tags=SSH_COLLECTOR_EVENT_TAGS,
         stolen_credentials=[collected_credentials],
diff --git a/monkey/infection_monkey/exploit/HostExploiter.py b/monkey/infection_monkey/exploit/HostExploiter.py
index 8ca63c3ba..bb5d7f87d 100644
--- a/monkey/infection_monkey/exploit/HostExploiter.py
+++ b/monkey/infection_monkey/exploit/HostExploiter.py
@@ -4,7 +4,7 @@ from abc import abstractmethod
 from datetime import datetime
 from typing import Dict
 
-from common.event_queue import IEventQueue
+from common.event_queue import IAgentEventQueue
 from common.utils.exceptions import FailedExploitationError
 from infection_monkey.i_puppet import ExploiterResultData
 from infection_monkey.telemetry.messengers.i_telemetry_messenger import ITelemetryMessenger
@@ -60,7 +60,7 @@ class HostExploiter:
         host,
         current_depth: int,
         telemetry_messenger: ITelemetryMessenger,
-        event_queue: IEventQueue,
+        event_queue: IAgentEventQueue,
         agent_binary_repository: IAgentBinaryRepository,
         options: Dict,
         interrupt: threading.Event,
diff --git a/monkey/infection_monkey/exploit/exploiter_wrapper.py b/monkey/infection_monkey/exploit/exploiter_wrapper.py
index 3e369134f..8b69ce9d5 100644
--- a/monkey/infection_monkey/exploit/exploiter_wrapper.py
+++ b/monkey/infection_monkey/exploit/exploiter_wrapper.py
@@ -1,7 +1,7 @@
 import threading
 from typing import Dict, Type
 
-from common.event_queue import IEventQueue
+from common.event_queue import IAgentEventQueue
 from infection_monkey.model import VictimHost
 from infection_monkey.telemetry.messengers.i_telemetry_messenger import ITelemetryMessenger
 
@@ -22,7 +22,7 @@ class ExploiterWrapper:
             self,
             exploit_class: Type[HostExploiter],
             telemetry_messenger: ITelemetryMessenger,
-            event_queue: IEventQueue,
+            event_queue: IAgentEventQueue,
             agent_binary_repository: IAgentBinaryRepository,
         ):
             self._exploit_class = exploit_class
@@ -47,7 +47,7 @@ class ExploiterWrapper:
     def __init__(
         self,
         telemetry_messenger: ITelemetryMessenger,
-        event_queue: IEventQueue,
+        event_queue: IAgentEventQueue,
         agent_binary_repository: IAgentBinaryRepository,
     ):
         self._telemetry_messenger = telemetry_messenger
diff --git a/monkey/infection_monkey/monkey.py b/monkey/infection_monkey/monkey.py
index 02e6b57ad..9e8e689ed 100644
--- a/monkey/infection_monkey/monkey.py
+++ b/monkey/infection_monkey/monkey.py
@@ -10,7 +10,7 @@ from typing import List
 from pubsub.core import Publisher
 
 import infection_monkey.tunnel as tunnel
-from common.event_queue import IEventQueue, PyPubSubEventQueue
+from common.event_queue import IAgentEventQueue, PyPubSubEventQueue
 from common.events import CredentialsStolenEvent
 from common.network.network_utils import address_to_ip_port
 from common.utils.argparse_types import positive_int
@@ -228,7 +228,7 @@ class InfectionMonkey:
 
     @staticmethod
     def _subscribe_events(
-        event_queue: IEventQueue,
+        event_queue: IAgentEventQueue,
         propagation_credentials_repository: IPropagationCredentialsRepository,
     ):
         event_queue.subscribe_type(
@@ -249,7 +249,7 @@ class InfectionMonkey:
     def _build_puppet(
         self,
         propagation_credentials_repository: IPropagationCredentialsRepository,
-        event_queue: IEventQueue,
+        event_queue: IAgentEventQueue,
     ) -> IPuppet:
         puppet = Puppet()