diff --git a/monkey/common/agent_event_serializers/agent_event_serializer_registry.py b/monkey/common/agent_event_serializers/agent_event_serializer_registry.py
index 6e5dcee10..38683c21f 100644
--- a/monkey/common/agent_event_serializers/agent_event_serializer_registry.py
+++ b/monkey/common/agent_event_serializers/agent_event_serializer_registry.py
@@ -1,7 +1,7 @@
 from typing import Type, Union
 
 from common.agent_event_serializers import IAgentEventSerializer
-from common.events import AbstractAgentEvent
+from common.agent_events import AbstractAgentEvent
 
 
 class AgentEventSerializerRegistry:
diff --git a/monkey/common/agent_event_serializers/i_agent_event_serializer.py b/monkey/common/agent_event_serializers/i_agent_event_serializer.py
index 9a56fcc65..348f81e04 100644
--- a/monkey/common/agent_event_serializers/i_agent_event_serializer.py
+++ b/monkey/common/agent_event_serializers/i_agent_event_serializer.py
@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Dict, List, Union
 
-from common.events import AbstractAgentEvent
+from common.agent_events import AbstractAgentEvent
 
 JSONSerializable = Union[  # type: ignore[misc]
     Dict[str, "JSONSerializable"],  # type: ignore[misc]
diff --git a/monkey/common/agent_event_serializers/pydantic_agent_event_serializer.py b/monkey/common/agent_event_serializers/pydantic_agent_event_serializer.py
index 3ecf12de8..f597cfb87 100644
--- a/monkey/common/agent_event_serializers/pydantic_agent_event_serializer.py
+++ b/monkey/common/agent_event_serializers/pydantic_agent_event_serializer.py
@@ -1,7 +1,7 @@
 import logging
 from typing import Generic, Type, TypeVar
 
-from common.events import AbstractAgentEvent
+from common.agent_events import AbstractAgentEvent
 from common.utils.code_utils import del_key
 
 from . import EVENT_TYPE_FIELD, IAgentEventSerializer, JSONSerializable
diff --git a/monkey/common/agent_event_serializers/register.py b/monkey/common/agent_event_serializers/register.py
index 881a06f5b..fbe353db9 100644
--- a/monkey/common/agent_event_serializers/register.py
+++ b/monkey/common/agent_event_serializers/register.py
@@ -1,4 +1,4 @@
-from common.events import CredentialsStolenEvent
+from common.agent_events import CredentialsStolenEvent
 
 from . import AgentEventSerializerRegistry, PydanticAgentEventSerializer
 
diff --git a/monkey/common/events/__init__.py b/monkey/common/agent_events/__init__.py
similarity index 100%
rename from monkey/common/events/__init__.py
rename to monkey/common/agent_events/__init__.py
diff --git a/monkey/common/events/abstract_agent_event.py b/monkey/common/agent_events/abstract_agent_event.py
similarity index 100%
rename from monkey/common/events/abstract_agent_event.py
rename to monkey/common/agent_events/abstract_agent_event.py
diff --git a/monkey/common/events/credentials_stolen_events.py b/monkey/common/agent_events/credentials_stolen_events.py
similarity index 100%
rename from monkey/common/events/credentials_stolen_events.py
rename to monkey/common/agent_events/credentials_stolen_events.py
diff --git a/monkey/common/event_queue/i_agent_event_queue.py b/monkey/common/event_queue/i_agent_event_queue.py
index 19ef65e2b..aadcd1f95 100644
--- a/monkey/common/event_queue/i_agent_event_queue.py
+++ b/monkey/common/event_queue/i_agent_event_queue.py
@@ -1,7 +1,7 @@
 from abc import ABC, abstractmethod
 from typing import Type
 
-from common.events import AbstractAgentEvent
+from common.agent_events import AbstractAgentEvent
 
 from . import AgentEventSubscriber
 
diff --git a/monkey/common/event_queue/pypubsub_agent_event_queue.py b/monkey/common/event_queue/pypubsub_agent_event_queue.py
index 246b743d1..ae8525db4 100644
--- a/monkey/common/event_queue/pypubsub_agent_event_queue.py
+++ b/monkey/common/event_queue/pypubsub_agent_event_queue.py
@@ -3,8 +3,8 @@ from typing import Type
 
 from pubsub.core import Publisher
 
+from common.agent_events import AbstractAgentEvent
 from common.event_queue import PyPubSubPublisherWrapper
-from common.events import AbstractAgentEvent
 
 from . import AgentEventSubscriber, IAgentEventQueue
 
diff --git a/monkey/common/event_queue/types.py b/monkey/common/event_queue/types.py
index 6b57ae712..f6554c0ba 100644
--- a/monkey/common/event_queue/types.py
+++ b/monkey/common/event_queue/types.py
@@ -1,5 +1,5 @@
 from typing import Callable
 
-from common.events import AbstractAgentEvent
+from common.agent_events import AbstractAgentEvent
 
 AgentEventSubscriber = Callable[[AbstractAgentEvent], None]