diff --git a/Engine.Core/Abstract/Assignable/IAssignable.cs b/Engine.Core/Abstract/Assignable/IAssignable.cs
index bd4af57..04137dc 100644
--- a/Engine.Core/Abstract/Assignable/IAssignable.cs
+++ b/Engine.Core/Abstract/Assignable/IAssignable.cs
@@ -8,7 +8,7 @@ public interface IAssignable
     /// <summary>
     /// Event triggered when the <see cref="IAssignable"/>'s fields are unassigned and completely ready to recycle.
     /// </summary> 
-    event OnUnassignedEventHandler? OnUnassigned;
+    event UnassignEventHandler? OnUnassigned;
 
     /// <summary>
     /// Unassign <see cref="IAssignable"/>'s all fields and make it ready to recycle.
@@ -18,5 +18,5 @@ public interface IAssignable
     /// </returns>
     bool Unassign();
 
-    delegate void OnUnassignedEventHandler(IAssignable sender);
+    delegate void UnassignEventHandler(IAssignable sender);
 }
diff --git a/Engine.Core/Abstract/Assignable/IHasBehaviourController.cs b/Engine.Core/Abstract/Assignable/IHasBehaviourController.cs
index b5218c3..496147d 100644
--- a/Engine.Core/Abstract/Assignable/IHasBehaviourController.cs
+++ b/Engine.Core/Abstract/Assignable/IHasBehaviourController.cs
@@ -8,7 +8,7 @@ public interface IHasBehaviourController : IAssignable
     /// <summary>
     /// Event triggered when the <see cref="IBehaviourController"/> value has has been assigned a new value.
     /// </summary>
-    event OnBehaviourControllerAssignedEventHandler? OnBehaviourControllerAssigned;
+    event BehaviourControllerAssignedEventHandler? OnBehaviourControllerAssigned;
 
     /// <inheritdoc cref="IBehaviourController" />
     IBehaviourController BehaviourController { get; }
@@ -22,5 +22,5 @@ public interface IHasBehaviourController : IAssignable
     /// </returns>
     bool Assign(IBehaviourController behaviourController);
 
-    delegate void OnBehaviourControllerAssignedEventHandler(IHasBehaviourController sender);
+    delegate void BehaviourControllerAssignedEventHandler(IHasBehaviourController sender);
 }
diff --git a/Engine.Core/Abstract/Assignable/IHasEntity.cs b/Engine.Core/Abstract/Assignable/IHasEntity.cs
index 6ffcaeb..90e8ec6 100644
--- a/Engine.Core/Abstract/Assignable/IHasEntity.cs
+++ b/Engine.Core/Abstract/Assignable/IHasEntity.cs
@@ -8,7 +8,7 @@ public interface IHasEntity : IAssignable
     /// <summary>
     /// Event triggered when the <see cref="IEntity"/> value has has been assigned a new value.
     /// </summary>
-    event OnEntityAssignedEventHandler? OnEntityAssigned;
+    event EntityAssignedEventHandler? OnEntityAssigned;
 
     /// <inheritdoc cref="IEntity" />
     IEntity Entity { get; }
@@ -22,5 +22,5 @@ public interface IHasEntity : IAssignable
     /// </returns>
     bool Assign(IEntity entity);
 
-    delegate void OnEntityAssignedEventHandler(IHasEntity sender);
+    delegate void EntityAssignedEventHandler(IHasEntity sender);
 }
diff --git a/Engine.Core/Abstract/Assignable/IHasGameManager.cs b/Engine.Core/Abstract/Assignable/IHasGameManager.cs
index cb3f4d4..9946837 100644
--- a/Engine.Core/Abstract/Assignable/IHasGameManager.cs
+++ b/Engine.Core/Abstract/Assignable/IHasGameManager.cs
@@ -8,7 +8,7 @@ public interface IHasGameManager : IAssignable
     /// <summary>
     /// Event triggered when the <see cref="IGameManager"/> value has has been assigned a new value.
     /// </summary>
-    event OnGameManagerAssignedEventHandler? OnGameManagerAssigned;
+    event GameManagerAssignedEventHandler? OnGameManagerAssigned;
 
     /// <inheritdoc cref="IGameManager" />
     IGameManager GameManager { get; }
@@ -22,5 +22,5 @@ public interface IHasGameManager : IAssignable
     /// </returns>
     bool Assign(IGameManager gameManager);
 
-    delegate void OnGameManagerAssignedEventHandler(IHasGameManager sender);
+    delegate void GameManagerAssignedEventHandler(IHasGameManager sender);
 }
diff --git a/Engine.Core/Abstract/Assignable/IHasHierarchyObject.cs b/Engine.Core/Abstract/Assignable/IHasHierarchyObject.cs
index f8d3df9..6b7c6c9 100644
--- a/Engine.Core/Abstract/Assignable/IHasHierarchyObject.cs
+++ b/Engine.Core/Abstract/Assignable/IHasHierarchyObject.cs
@@ -8,7 +8,7 @@ public interface IHasHierarchyObject : IAssignable
     /// <summary>
     /// Event triggered when the <see cref="IHierarchyObject"/> value has has been assigned a new value.
     /// </summary>
-    event OnHierarchyObjectAssignedEventHandler? OnHierarchyObjectAssigned;
+    event HierarchyObjectAssignedEventHandler? OnHierarchyObjectAssigned;
 
     /// <inheritdoc cref="IHierarchyObject" />
     IHierarchyObject HierarchyObject { get; }
@@ -22,5 +22,5 @@ public interface IHasHierarchyObject : IAssignable
     /// </returns>
     bool Assign(IHierarchyObject hierarchyObject);
 
-    delegate void OnHierarchyObjectAssignedEventHandler(IHasHierarchyObject sender);
+    delegate void HierarchyObjectAssignedEventHandler(IHasHierarchyObject sender);
 }
diff --git a/Engine.Core/Abstract/Assignable/IHasStateEnable.cs b/Engine.Core/Abstract/Assignable/IHasStateEnable.cs
index 54a5b52..73561e7 100644
--- a/Engine.Core/Abstract/Assignable/IHasStateEnable.cs
+++ b/Engine.Core/Abstract/Assignable/IHasStateEnable.cs
@@ -8,7 +8,7 @@ public interface IHasStateEnable : IAssignable
     /// <summary>
     /// Event triggered when the <see cref="IStateEnable"/> value has has been assigned a new value.
     /// </summary>
-    event OnStateEnableAssignedEventHandler? OnStateEnableAssigned;
+    event StateEnableAssignedEventHandler? OnStateEnableAssigned;
 
     /// <inheritdoc cref="IStateEnable" />
     IStateEnable StateEnable { get; }
@@ -22,5 +22,5 @@ public interface IHasStateEnable : IAssignable
     /// </returns>
     bool Assign(IStateEnable stateEnable);
 
-    delegate void OnStateEnableAssignedEventHandler(IHasStateEnable sender);
+    delegate void StateEnableAssignedEventHandler(IHasStateEnable sender);
 }
diff --git a/Engine.Core/Abstract/BaseEntity.cs b/Engine.Core/Abstract/BaseEntity.cs
index ae456e1..52e67a9 100644
--- a/Engine.Core/Abstract/BaseEntity.cs
+++ b/Engine.Core/Abstract/BaseEntity.cs
@@ -4,13 +4,13 @@ namespace Syntriax.Engine.Core.Abstract;
 
 public abstract class BaseEntity : IEntity
 {
-    public event IEntity.OnIdChangedEventHandler? OnIdChanged = null;
+    public event IEntity.IdChangedEventHandler? OnIdChanged = null;
 
-    public event IInitializable.OnInitializedEventHandler? OnInitialized = null;
-    public event IInitializable.OnFinalizedEventHandler? OnFinalized = null;
+    public event IInitializable.InitializedEventHandler? OnInitialized = null;
+    public event IInitializable.FinalizedEventHandler? OnFinalized = null;
 
-    public event IHasStateEnable.OnStateEnableAssignedEventHandler? OnStateEnableAssigned = null;
-    public event IAssignable.OnUnassignedEventHandler? OnUnassigned = null;
+    public event IHasStateEnable.StateEnableAssignedEventHandler? OnStateEnableAssigned = null;
+    public event IAssignable.UnassignEventHandler? OnUnassigned = null;
 
     private IStateEnable _stateEnable = null!;
 
diff --git a/Engine.Core/Abstract/IBehaviour.cs b/Engine.Core/Abstract/IBehaviour.cs
index cdd25a1..9fc2d30 100644
--- a/Engine.Core/Abstract/IBehaviour.cs
+++ b/Engine.Core/Abstract/IBehaviour.cs
@@ -8,7 +8,7 @@ public interface IBehaviour : IEntity, IHasBehaviourController, IHasStateEnable
     /// <summary>
     /// Event triggered when the priority of the <see cref="IBehaviour"/> changes.
     /// </summary>
-    event OnPriorityChangedEventHandler? OnPriorityChanged;
+    event PriorityChangedEventHandler? OnPriorityChanged;
 
     /// <summary>
     /// The priority of the <see cref="IBehaviour"/>.
@@ -20,5 +20,5 @@ public interface IBehaviour : IEntity, IHasBehaviourController, IHasStateEnable
     /// </summary>
     bool IsActive { get; }
 
-    delegate void OnPriorityChangedEventHandler(IBehaviour sender, int previousPriority);
+    delegate void PriorityChangedEventHandler(IBehaviour sender, int previousPriority);
 }
diff --git a/Engine.Core/Abstract/IBehaviourCollector.cs b/Engine.Core/Abstract/IBehaviourCollector.cs
index 84bf28b..e0d38e9 100644
--- a/Engine.Core/Abstract/IBehaviourCollector.cs
+++ b/Engine.Core/Abstract/IBehaviourCollector.cs
@@ -12,24 +12,24 @@ public interface IBehaviourCollector<T> : IHasGameManager, IEnumerable<T> where
     /// <summary>
     /// Event triggered when an object of type <typeparamref name="T"/> is added to the collector.
     /// </summary>
-    event OnCollectedEventHandler? OnCollected;
+    event CollectedEventHandler? OnCollected;
 
     /// <summary>
     /// Event triggered when an object of type <typeparamref name="T"/> is removed from the collector.
     /// </summary>
-    event OnRemovedEventHandler? OnRemoved;
+    event RemovedEventHandler? OnRemoved;
 
     /// <summary>
     /// Delegate for handling the <see cref="OnCollected"/> event.
     /// </summary>
     /// <param name="sender">The instance of the <see cref="BehaviourCollector{T}"/> that triggered the event.</param>
     /// <param name="behaviourCollected">The object of type <typeparamref name="T"/> that was added to the collector.</param>
-    public delegate void OnCollectedEventHandler(BehaviourCollector<T> sender, T behaviourCollected);
+    public delegate void CollectedEventHandler(BehaviourCollector<T> sender, T behaviourCollected);
 
     /// <summary>
     /// Delegate for handling the <see cref="OnRemoved"/> event.
     /// </summary>
     /// <param name="sender">The instance of the <see cref="BehaviourCollector{T}"/> that triggered the event.</param>
     /// <param name="behaviourRemoved">The object of type <typeparamref name="T"/> that was removed from the collector.</param>
-    public delegate void OnRemovedEventHandler(BehaviourCollector<T> sender, T behaviourRemoved);
+    public delegate void RemovedEventHandler(BehaviourCollector<T> sender, T behaviourRemoved);
 }
diff --git a/Engine.Core/Abstract/IBehaviourController.cs b/Engine.Core/Abstract/IBehaviourController.cs
index 8b92caa..64fa28e 100644
--- a/Engine.Core/Abstract/IBehaviourController.cs
+++ b/Engine.Core/Abstract/IBehaviourController.cs
@@ -10,27 +10,27 @@ public interface IBehaviourController : IInitializable, IHasHierarchyObject, IEn
     /// <summary>
     /// Event triggered before the update of <see cref="IBehaviour"/>s.
     /// </summary>
-    event OnPreUpdateEventHandler? OnPreUpdate;
+    event PreUpdateEventHandler? OnPreUpdate;
 
     /// <summary>
     /// Event triggered during the update of <see cref="IBehaviour"/>s.
     /// </summary>
-    event OnUpdateEventHandler? OnUpdate;
+    event UpdateEventHandler? OnUpdate;
 
     /// <summary>
     /// Event triggered before the drawing phase.
     /// </summary>
-    event OnPreDrawEventHandler? OnPreDraw;
+    event PreDrawEventHandler? OnPreDraw;
 
     /// <summary>
     /// Event triggered when a <see cref="IBehaviour"/> is added to the <see cref="IBehaviourController"/>.
     /// </summary>
-    event OnBehaviourAddedEventHandler? OnBehaviourAdded;
+    event BehaviourAddedEventHandler? OnBehaviourAdded;
 
     /// <summary>
     /// Event triggered when a <see cref="IBehaviour"/> is removed from the <see cref="IBehaviourController"/>.
     /// </summary>
-    event OnBehaviourRemovedEventHandler? OnBehaviourRemoved;
+    event BehaviourRemovedEventHandler? OnBehaviourRemoved;
 
     /// <summary>
     /// Adds a <see cref="IBehaviour"/> to the <see cref="IBehaviourController"/>.
@@ -93,10 +93,10 @@ public interface IBehaviourController : IInitializable, IHasHierarchyObject, IEn
     /// </summary>
     void UpdatePreDraw();
 
-    delegate void OnPreUpdateEventHandler(IBehaviourController sender);
-    delegate void OnUpdateEventHandler(IBehaviourController sender);
-    delegate void OnPreDrawEventHandler(IBehaviourController sender);
-    delegate void OnBehaviourAddedEventHandler(IBehaviourController sender, IBehaviour behaviourAdded);
-    delegate void OnBehaviourRemovedEventHandler(IBehaviourController sender, IBehaviour behaviourRemoved);
+    delegate void PreUpdateEventHandler(IBehaviourController sender);
+    delegate void UpdateEventHandler(IBehaviourController sender);
+    delegate void PreDrawEventHandler(IBehaviourController sender);
+    delegate void BehaviourAddedEventHandler(IBehaviourController sender, IBehaviour behaviourAdded);
+    delegate void BehaviourRemovedEventHandler(IBehaviourController sender, IBehaviour behaviourRemoved);
 
 }
diff --git a/Engine.Core/Abstract/IEntity.cs b/Engine.Core/Abstract/IEntity.cs
index d88e34b..984603b 100644
--- a/Engine.Core/Abstract/IEntity.cs
+++ b/Engine.Core/Abstract/IEntity.cs
@@ -9,12 +9,12 @@ public interface IEntity : IInitializable, IHasStateEnable
     /// Event triggered when the <see cref="Id"/> of the <see cref="IEntity"/> changes.
     /// The string action parameter is the previous <see cref="Id"/> of the <see cref="IEntity"/>. 
     /// </summary>
-    event OnIdChangedEventHandler? OnIdChanged;
+    event IdChangedEventHandler? OnIdChanged;
 
     /// <summary>
     /// The ID of the <see cref="IEntity"/>.
     /// </summary>
     string Id { get; set; }
 
-    delegate void OnIdChangedEventHandler(IEntity sender, string previousId);
+    delegate void IdChangedEventHandler(IEntity sender, string previousId);
 }
diff --git a/Engine.Core/Abstract/IGameManager.cs b/Engine.Core/Abstract/IGameManager.cs
index 9eaa0bb..85df155 100644
--- a/Engine.Core/Abstract/IGameManager.cs
+++ b/Engine.Core/Abstract/IGameManager.cs
@@ -10,22 +10,22 @@ public interface IGameManager : IEntity
     /// <summary>
     /// Event triggered when <see cref="Update(EngineTime)"/> is called on the <see cref="IGameManager"/>.
     /// </summary>
-    event OnUpdateEventHandler? OnUpdate;
+    event UpdateEventHandler? OnUpdate;
 
     /// <summary>
     /// Event triggered when <see cref="PreDraw"/> is called on the <see cref="IGameManager"/>.
     /// </summary>
-    event OnPreDawEventHandler? OnPreDraw;
+    event PreDawEventHandler? OnPreDraw;
 
     /// <summary>
     /// Event triggered when a <see cref="IHierarchyObject"/> is registered to the <see cref="IGameManager"/>.
     /// </summary>
-    event OnHierarchyObjectRegisteredEventHandler? OnHierarchyObjectRegistered;
+    event HierarchyObjectRegisteredEventHandler? OnHierarchyObjectRegistered;
 
     /// <summary>
     /// Event triggered when a <see cref="IHierarchyObject"/> is unregistered from the <see cref="IGameManager"/>.
     /// </summary>
-    event OnHierarchyObjectUnRegisteredEventHandler? OnHierarchyObjectUnRegistered;
+    event HierarchyObjectUnRegisteredEventHandler? OnHierarchyObjectUnRegistered;
 
     /// <summary>
     /// Gets a read-only list of <see cref="IHierarchyObject"/>s managed by the <see cref="IGameManager"/>.
@@ -63,9 +63,9 @@ public interface IGameManager : IEntity
     /// </summary>
     void PreDraw();
 
-    delegate void OnUpdateEventHandler(IGameManager sender, EngineTime time);
-    delegate void OnPreDawEventHandler(IGameManager sender);
+    delegate void UpdateEventHandler(IGameManager sender, EngineTime time);
+    delegate void PreDawEventHandler(IGameManager sender);
 
-    delegate void OnHierarchyObjectRegisteredEventHandler(IGameManager sender, IHierarchyObject hierarchyObjectRegistered);
-    delegate void OnHierarchyObjectUnRegisteredEventHandler(IGameManager sender, IHierarchyObject hierarchyObjectUnregistered);
+    delegate void HierarchyObjectRegisteredEventHandler(IGameManager sender, IHierarchyObject hierarchyObjectRegistered);
+    delegate void HierarchyObjectUnRegisteredEventHandler(IGameManager sender, IHierarchyObject hierarchyObjectUnregistered);
 }
diff --git a/Engine.Core/Abstract/IHierarchyObject.cs b/Engine.Core/Abstract/IHierarchyObject.cs
index 4edccda..aa5d7c3 100644
--- a/Engine.Core/Abstract/IHierarchyObject.cs
+++ b/Engine.Core/Abstract/IHierarchyObject.cs
@@ -12,27 +12,27 @@ public interface IHierarchyObject : IEntity, INameable, IHasBehaviourController,
     /// <summary>
     /// Event triggered when the <see cref="IHierarchyObject"/> enters the hierarchy.
     /// </summary>
-    event OnEnteredHierarchyEventHandler? OnEnteredHierarchy;
+    event EnteredHierarchyEventHandler? OnEnteredHierarchy;
 
     /// <summary>
     /// Event triggered when the <see cref="IHierarchyObject"/> exits the hierarchy.
     /// </summary>
-    event OnExitedHierarchyEventHandler? OnExitedHierarchy;
+    event ExitedHierarchyEventHandler? OnExitedHierarchy;
 
     /// <summary>
     /// Event triggered when the <see cref="Parent"/> of the <see cref="IHierarchyObject"/> changes. The second parameter is the old <see cref="IHierarchyObject"/>.
     /// </summary>
-    event OnParentChangedEventHandler? OnParentChanged;
+    event ParentChangedEventHandler? OnParentChanged;
 
     /// <summary>
     /// Event triggered when a new <see cref="IHierarchyObject"/> is added to the <see cref="Children"/>.
     /// </summary>
-    event OnChildrenAddedEventHandler? OnChildrenAdded;
+    event ChildrenAddedEventHandler? OnChildrenAdded;
 
     /// <summary>
     /// Event triggered when an <see cref="IHierarchyObject"/> is removed from the <see cref="Children"/>.
     /// </summary>
-    event OnChildrenRemovedEventHandler? OnChildrenRemoved;
+    event ChildrenRemovedEventHandler? OnChildrenRemoved;
 
     /// <summary>
     /// Gets the <see cref="IGameManager"/> this <see cref="IHierarchyObject"/> is connected to, if any.
@@ -98,14 +98,14 @@ public interface IHierarchyObject : IEntity, INameable, IHasBehaviourController,
     /// </summary>
     /// <param name="sender">The <see cref="IHierarchyObject"/> that entered the hierarchy.</param>
     /// <param name="gameManager">The <see cref="IGameManager"/> that the <see cref="IHierarchyObject"/> has entered it's hierarchy.</param>
-    delegate void OnEnteredHierarchyEventHandler(IHierarchyObject sender, IGameManager gameManager);
+    delegate void EnteredHierarchyEventHandler(IHierarchyObject sender, IGameManager gameManager);
 
     /// <summary>
     /// EventHandler delegate for the event triggered when the <see cref="IHierarchyObject"/> exits the hierarchy of a <see cref="IGameManager">.
     /// </summary>
     /// <param name="sender">The <see cref="IHierarchyObject"/> that exited the hierarchy.</param>
     /// <param name="gameManager">The <see cref="IGameManager"/> that the <see cref="IHierarchyObject"/> has exited it's hierarchy.</param>
-    delegate void OnExitedHierarchyEventHandler(IHierarchyObject sender, IGameManager gameManager);
+    delegate void ExitedHierarchyEventHandler(IHierarchyObject sender, IGameManager gameManager);
 
     /// <summary>
     /// Delegate for the event triggered when the <see cref="IHierarchyObject"/>'s parent changes.
@@ -113,19 +113,19 @@ public interface IHierarchyObject : IEntity, INameable, IHasBehaviourController,
     /// <param name="sender">The <see cref="IHierarchyObject"/> that the parent has changed.</param>
     /// <param name="previousParent">The previous <see cref="IHierarchyObject"/> the sender was a child of.</param>
     /// <param name="newParent">The new and current <see cref="IHierarchyObject"/> the sender is a child of.</param>
-    delegate void OnParentChangedEventHandler(IHierarchyObject sender, IHierarchyObject? previousParent, IHierarchyObject? newParent);
+    delegate void ParentChangedEventHandler(IHierarchyObject sender, IHierarchyObject? previousParent, IHierarchyObject? newParent);
 
     /// <summary>
     /// Delegate for the event triggered when a new <see cref="IHierarchyObject"/> added as a child.
     /// </summary>
     /// <param name="sender">The parent <see cref="IHierarchyObject"/> this event is being called from.</param>
     /// <param name="childrenAdded">The <see cref="IHierarchyObject"/> that got removed as a children of the sender <see cref="IHierarchyObject"/>.</param>
-    delegate void OnChildrenAddedEventHandler(IHierarchyObject sender, IHierarchyObject childrenAdded);
+    delegate void ChildrenAddedEventHandler(IHierarchyObject sender, IHierarchyObject childrenAdded);
 
     /// <summary>
     /// Delegate for the event triggered when a new <see cref="IHierarchyObject"/> removed from being a child.
     /// </summary>
     /// <param name="sender">The parent <see cref="IHierarchyObject"/> this event is being called from.</param>
     /// <param name="childrenAdded">The <see cref="IHierarchyObject"/> that got removed as a children of the sender <see cref="IHierarchyObject"/>.</param>
-    delegate void OnChildrenRemovedEventHandler(IHierarchyObject sender, IHierarchyObject childrenRemoved);
+    delegate void ChildrenRemovedEventHandler(IHierarchyObject sender, IHierarchyObject childrenRemoved);
 }
diff --git a/Engine.Core/Abstract/IInitializable.cs b/Engine.Core/Abstract/IInitializable.cs
index 7a666d0..54ff8a1 100644
--- a/Engine.Core/Abstract/IInitializable.cs
+++ b/Engine.Core/Abstract/IInitializable.cs
@@ -8,12 +8,12 @@ public interface IInitializable
     /// <summary>
     /// Event triggered when the <see cref="Initialize"/> method is called successfully.
     /// </summary>
-    event OnInitializedEventHandler? OnInitialized;
+    event InitializedEventHandler? OnInitialized;
 
     /// <summary>
     /// Event triggered when the <see cref="IInitializable"/> method is called successfully.
     /// </summary>
-    event OnFinalizedEventHandler? OnFinalized;
+    event FinalizedEventHandler? OnFinalized;
 
     /// <summary>
     /// The value indicating whether the entity has been initialized.
@@ -32,6 +32,6 @@ public interface IInitializable
     /// <returns><see cref="true"/> if finalization is successful, otherwise <see cref="false"/>.</returns>
     bool Finalize();
 
-    delegate void OnInitializedEventHandler(IInitializable sender);
-    delegate void OnFinalizedEventHandler(IInitializable sender);
+    delegate void InitializedEventHandler(IInitializable sender);
+    delegate void FinalizedEventHandler(IInitializable sender);
 }
diff --git a/Engine.Core/Abstract/INameable.cs b/Engine.Core/Abstract/INameable.cs
index 202cc49..4a60100 100644
--- a/Engine.Core/Abstract/INameable.cs
+++ b/Engine.Core/Abstract/INameable.cs
@@ -8,12 +8,12 @@ public interface INameable
     /// <summary>
     /// Event triggered when the name of the entity changes.
     /// </summary>
-    event OnNameChangedEventHandler? OnNameChanged;
+    event NameChangedEventHandler? OnNameChanged;
 
     /// <summary>
     /// The name of the entity.
     /// </summary>
     string Name { get; set; }
 
-    delegate void OnNameChangedEventHandler(INameable sender, string previousName);
+    delegate void NameChangedEventHandler(INameable sender, string previousName);
 }
diff --git a/Engine.Core/Abstract/IStateEnable.cs b/Engine.Core/Abstract/IStateEnable.cs
index 3ef6726..8debf8c 100644
--- a/Engine.Core/Abstract/IStateEnable.cs
+++ b/Engine.Core/Abstract/IStateEnable.cs
@@ -8,12 +8,12 @@ public interface IStateEnable : IHasEntity
     /// <summary>
     /// Event triggered when the <see cref="Enabled"/> state of the <see cref="IStateEnable"/> changes.
     /// </summary>
-    event OnNameChangedEventHandler? OnEnabledChanged;
+    event NameChangedEventHandler? OnEnabledChanged;
 
     /// <summary>
     /// The value indicating whether the <see cref="IStateEnable"/> is enabled.
     /// </summary>
     bool Enabled { get; set; }
 
-    delegate void OnNameChangedEventHandler(IStateEnable sender, bool previousState);
+    delegate void NameChangedEventHandler(IStateEnable sender, bool previousState);
 }
diff --git a/Engine.Core/Abstract/ITransform2D.cs b/Engine.Core/Abstract/ITransform2D.cs
index 3209784..f085501 100644
--- a/Engine.Core/Abstract/ITransform2D.cs
+++ b/Engine.Core/Abstract/ITransform2D.cs
@@ -8,17 +8,17 @@ public interface ITransform2D : IBehaviour
     /// <summary>
     /// Event triggered when the <see cref="Position"/> of the <see cref="ITransform2D"/> changes.
     /// </summary>
-    event OnPositionChangedEventHandler? OnPositionChanged;
+    event PositionChangedEventHandler? OnPositionChanged;
 
     /// <summary>
     /// Event triggered when the <see cref="Scale"/> of the <see cref="ITransform2D"/> changes.
     /// </summary>
-    event OnScaleChangedEventHandler? OnScaleChanged;
+    event ScaleChangedEventHandler? OnScaleChanged;
 
     /// <summary>
     /// Event triggered when the <see cref="Rotation"/> of the <see cref="ITransform"/> changes.
     /// </summary>
-    event OnRotationChangedEventHandler? OnRotationChanged;
+    event RotationChangedEventHandler? OnRotationChanged;
 
     /// <summary>
     /// The world position of the <see cref="ITransform2D"/> in 2D space.
@@ -55,19 +55,19 @@ public interface ITransform2D : IBehaviour
     /// </summary>
     /// <param name="sender">The <see cref="ITransform2D"/> that the parent has changed.</param>
     /// <param name="previousPosition">The previous <see cref="Position"/> of the <see cref="ITransform2D"/>.</param>
-    delegate void OnPositionChangedEventHandler(ITransform2D sender, Vector2D previousPosition);
+    delegate void PositionChangedEventHandler(ITransform2D sender, Vector2D previousPosition);
 
     /// <summary>
     /// Delegate for the event triggered when the <see cref="ITransform2D"/>'s rotation changes.
     /// </summary>
     /// <param name="sender">The <see cref="ITransform2D"/> that the parent has changed.</param>
     /// <param name="previousScale">The previous <see cref="Scale"/> of the <see cref="ITransform2D"/>.</param>
-    delegate void OnScaleChangedEventHandler(ITransform2D sender, Vector2D previousScale);
+    delegate void ScaleChangedEventHandler(ITransform2D sender, Vector2D previousScale);
 
     /// <summary>
     /// Delegate for the event triggered when the <see cref="ITransform2D"/>'s rotation changes.
     /// </summary>
     /// <param name="sender">The <see cref="ITransform2D"/> that the parent has changed.</param>
     /// <param name="previousRotation">The previous <see cref="Rotation"/> of the <see cref="ITransform2D"/>.</param>
-    delegate void OnRotationChangedEventHandler(ITransform2D sender, float previousRotation);
+    delegate void RotationChangedEventHandler(ITransform2D sender, float previousRotation);
 }
diff --git a/Engine.Core/BehaviourBase.cs b/Engine.Core/BehaviourBase.cs
index dfa7a16..8a7bbca 100644
--- a/Engine.Core/BehaviourBase.cs
+++ b/Engine.Core/BehaviourBase.cs
@@ -6,9 +6,9 @@ namespace Syntriax.Engine.Core;
 [System.Diagnostics.DebuggerDisplay("{GetType().Name, nq}, Priority: {Priority}, Initialized: {Initialized}")]
 public abstract class BehaviourBase : BaseEntity, IBehaviour
 {
-    public event IHasBehaviourController.OnBehaviourControllerAssignedEventHandler? OnBehaviourControllerAssigned = null;
+    public event IHasBehaviourController.BehaviourControllerAssignedEventHandler? OnBehaviourControllerAssigned = null;
 
-    public event IBehaviour.OnPriorityChangedEventHandler? OnPriorityChanged = null;
+    public event IBehaviour.PriorityChangedEventHandler? OnPriorityChanged = null;
 
     private IBehaviourController _behaviourController = null!;
 
diff --git a/Engine.Core/BehaviourCollector.cs b/Engine.Core/BehaviourCollector.cs
index 034a957..19e0a07 100644
--- a/Engine.Core/BehaviourCollector.cs
+++ b/Engine.Core/BehaviourCollector.cs
@@ -8,11 +8,11 @@ namespace Syntriax.Engine.Core;
 
 public class BehaviourCollector<T> : IBehaviourCollector<T> where T : class
 {
-    public event IAssignable.OnUnassignedEventHandler? OnUnassigned = null;
-    public event IHasGameManager.OnGameManagerAssignedEventHandler? OnGameManagerAssigned = null;
+    public event IAssignable.UnassignEventHandler? OnUnassigned = null;
+    public event IHasGameManager.GameManagerAssignedEventHandler? OnGameManagerAssigned = null;
 
-    public event IBehaviourCollector<T>.OnCollectedEventHandler? OnCollected = null;
-    public event IBehaviourCollector<T>.OnRemovedEventHandler? OnRemoved = null;
+    public event IBehaviourCollector<T>.CollectedEventHandler? OnCollected = null;
+    public event IBehaviourCollector<T>.RemovedEventHandler? OnRemoved = null;
 
     protected readonly List<T> _behaviours = new(32);
 
diff --git a/Engine.Core/BehaviourController.cs b/Engine.Core/BehaviourController.cs
index 1985111..f25c099 100644
--- a/Engine.Core/BehaviourController.cs
+++ b/Engine.Core/BehaviourController.cs
@@ -11,18 +11,18 @@ namespace Syntriax.Engine.Core;
 [System.Diagnostics.DebuggerDisplay("Behaviour Count: {behaviours.Count}")]
 public class BehaviourController : IBehaviourController
 {
-    public event IBehaviourController.OnPreUpdateEventHandler? OnPreUpdate = null;
-    public event IBehaviourController.OnUpdateEventHandler? OnUpdate = null;
-    public event IBehaviourController.OnPreDrawEventHandler? OnPreDraw = null;
+    public event IBehaviourController.PreUpdateEventHandler? OnPreUpdate = null;
+    public event IBehaviourController.UpdateEventHandler? OnUpdate = null;
+    public event IBehaviourController.PreDrawEventHandler? OnPreDraw = null;
 
-    public event IBehaviourController.OnBehaviourAddedEventHandler? OnBehaviourAdded = null;
-    public event IBehaviourController.OnBehaviourRemovedEventHandler? OnBehaviourRemoved = null;
-    public event IHasHierarchyObject.OnHierarchyObjectAssignedEventHandler? OnHierarchyObjectAssigned = null;
+    public event IBehaviourController.BehaviourAddedEventHandler? OnBehaviourAdded = null;
+    public event IBehaviourController.BehaviourRemovedEventHandler? OnBehaviourRemoved = null;
+    public event IHasHierarchyObject.HierarchyObjectAssignedEventHandler? OnHierarchyObjectAssigned = null;
 
-    public event IInitializable.OnInitializedEventHandler? OnInitialized = null;
-    public event IInitializable.OnFinalizedEventHandler? OnFinalized = null;
+    public event IInitializable.InitializedEventHandler? OnInitialized = null;
+    public event IInitializable.FinalizedEventHandler? OnFinalized = null;
 
-    public event IAssignable.OnUnassignedEventHandler? OnUnassigned = null;
+    public event IAssignable.UnassignEventHandler? OnUnassigned = null;
 
     private readonly IList<IBehaviour> behaviours = new List<IBehaviour>(Constants.BEHAVIOURS_SIZE_INITIAL);
 
diff --git a/Engine.Core/GameManager.cs b/Engine.Core/GameManager.cs
index e44430c..a4f00f4 100644
--- a/Engine.Core/GameManager.cs
+++ b/Engine.Core/GameManager.cs
@@ -10,11 +10,11 @@ namespace Syntriax.Engine.Core;
 [System.Diagnostics.DebuggerDisplay("HierarchyObject Count: {_hierarchyObjects.Count}")]
 public class GameManager : BaseEntity, IGameManager
 {
-    public event IGameManager.OnUpdateEventHandler? OnUpdate = null;
-    public event IGameManager.OnPreDawEventHandler? OnPreDraw = null;
+    public event IGameManager.UpdateEventHandler? OnUpdate = null;
+    public event IGameManager.PreDawEventHandler? OnPreDraw = null;
 
-    public event IGameManager.OnHierarchyObjectRegisteredEventHandler? OnHierarchyObjectRegistered = null;
-    public event IGameManager.OnHierarchyObjectUnRegisteredEventHandler? OnHierarchyObjectUnRegistered = null;
+    public event IGameManager.HierarchyObjectRegisteredEventHandler? OnHierarchyObjectRegistered = null;
+    public event IGameManager.HierarchyObjectUnRegisteredEventHandler? OnHierarchyObjectUnRegistered = null;
 
     private readonly List<IHierarchyObject> _hierarchyObjects = new(Constants.GAME_OBJECTS_SIZE_INITIAL);
 
diff --git a/Engine.Core/HierarchyObject.cs b/Engine.Core/HierarchyObject.cs
index c27e9bb..8691f11 100644
--- a/Engine.Core/HierarchyObject.cs
+++ b/Engine.Core/HierarchyObject.cs
@@ -8,13 +8,13 @@ namespace Syntriax.Engine.Core;
 [System.Diagnostics.DebuggerDisplay("Name: {Name}, Initialized: {Initialized}")]
 public class HierarchyObject : BaseEntity, IHierarchyObject
 {
-    public event IHierarchyObject.OnEnteredHierarchyEventHandler? OnEnteredHierarchy = null;
-    public event IHierarchyObject.OnExitedHierarchyEventHandler? OnExitedHierarchy = null;
-    public event IHierarchyObject.OnParentChangedEventHandler? OnParentChanged = null;
-    public event IHierarchyObject.OnChildrenAddedEventHandler? OnChildrenAdded = null;
-    public event IHierarchyObject.OnChildrenRemovedEventHandler? OnChildrenRemoved = null;
-    public event IHasBehaviourController.OnBehaviourControllerAssignedEventHandler? OnBehaviourControllerAssigned = null;
-    public event INameable.OnNameChangedEventHandler? OnNameChanged = null;
+    public event IHierarchyObject.EnteredHierarchyEventHandler? OnEnteredHierarchy = null;
+    public event IHierarchyObject.ExitedHierarchyEventHandler? OnExitedHierarchy = null;
+    public event IHierarchyObject.ParentChangedEventHandler? OnParentChanged = null;
+    public event IHierarchyObject.ChildrenAddedEventHandler? OnChildrenAdded = null;
+    public event IHierarchyObject.ChildrenRemovedEventHandler? OnChildrenRemoved = null;
+    public event IHasBehaviourController.BehaviourControllerAssignedEventHandler? OnBehaviourControllerAssigned = null;
+    public event INameable.NameChangedEventHandler? OnNameChanged = null;
 
     private string _name = nameof(HierarchyObject);
     private IGameManager _gameManager = null!;
diff --git a/Engine.Core/StateEnable.cs b/Engine.Core/StateEnable.cs
index 3885b7c..f00391b 100644
--- a/Engine.Core/StateEnable.cs
+++ b/Engine.Core/StateEnable.cs
@@ -4,9 +4,9 @@ namespace Syntriax.Engine.Core;
 
 public class StateEnable : IStateEnable
 {
-    public event IAssignable.OnUnassignedEventHandler? OnUnassigned = null;
-    public event IHasEntity.OnEntityAssignedEventHandler? OnEntityAssigned = null;
-    public event IStateEnable.OnNameChangedEventHandler? OnEnabledChanged = null;
+    public event IAssignable.UnassignEventHandler? OnUnassigned = null;
+    public event IHasEntity.EntityAssignedEventHandler? OnEntityAssigned = null;
+    public event IStateEnable.NameChangedEventHandler? OnEnabledChanged = null;
 
     private bool _enabled = true;
     private IEntity _entity = null!;
diff --git a/Engine.Core/Transform2D.cs b/Engine.Core/Transform2D.cs
index 1ae6c63..05a13d4 100644
--- a/Engine.Core/Transform2D.cs
+++ b/Engine.Core/Transform2D.cs
@@ -5,9 +5,9 @@ namespace Syntriax.Engine.Core;
 [System.Diagnostics.DebuggerDisplay("Name: {HierarchyObject.Name, nq} Position: {Position.ToString(), nq}, Scale: {Scale.ToString(), nq}, Rotation: {Rotation}")]
 public class Transform2D : Behaviour, ITransform2D
 {
-    public event ITransform2D.OnPositionChangedEventHandler? OnPositionChanged = null;
-    public event ITransform2D.OnScaleChangedEventHandler? OnScaleChanged = null;
-    public event ITransform2D.OnRotationChangedEventHandler? OnRotationChanged = null;
+    public event ITransform2D.PositionChangedEventHandler? OnPositionChanged = null;
+    public event ITransform2D.ScaleChangedEventHandler? OnScaleChanged = null;
+    public event ITransform2D.RotationChangedEventHandler? OnRotationChanged = null;
 
     private Vector2D _position = Vector2D.Zero;
     private Vector2D _scale = Vector2D.One;
diff --git a/Engine.Physics2D/Abstract/ICollider2D.cs b/Engine.Physics2D/Abstract/ICollider2D.cs
index 0d43232..379c083 100644
--- a/Engine.Physics2D/Abstract/ICollider2D.cs
+++ b/Engine.Physics2D/Abstract/ICollider2D.cs
@@ -10,17 +10,17 @@ public interface ICollider2D : IBehaviour
     /// <summary>
     /// Event triggered when a collision is detected.
     /// </summary>
-    event OnCollisionDetectedEventHandler? OnCollisionDetected;
+    event CollisionDetectedEventHandler? OnCollisionDetected;
 
     /// <summary>
     /// Event triggered when a collision is resolved.
     /// </summary>
-    event OnCollisionResolvedEventHandler? OnCollisionResolved;
+    event CollisionResolvedEventHandler? OnCollisionResolved;
 
     /// <summary>
     /// Event triggered when another <see cref="ICollider2D"/> triggers this <see cref="ICollider2D"/>.
     /// </summary>
-    event OnTriggeredEventHandler? OnTriggered;
+    event TriggeredEventHandler? OnTriggered;
 
     /// <inheritdoc cref="ITransform2D" />
     ITransform2D Transform { get; }
@@ -44,7 +44,7 @@ public interface ICollider2D : IBehaviour
     void Resolve(CollisionDetectionInformation collisionDetectionInformation);
     void Trigger(ICollider2D initiator);
 
-    delegate void OnCollisionDetectedEventHandler(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation);
-    delegate void OnCollisionResolvedEventHandler(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation);
-    delegate void OnTriggeredEventHandler(ICollider2D sender, ICollider2D initiatorCollider);
+    delegate void CollisionDetectedEventHandler(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation);
+    delegate void CollisionResolvedEventHandler(ICollider2D sender, CollisionDetectionInformation collisionDetectionInformation);
+    delegate void TriggeredEventHandler(ICollider2D sender, ICollider2D initiatorCollider);
 }
diff --git a/Engine.Physics2D/Abstract/IPhysicsEngine2D.cs b/Engine.Physics2D/Abstract/IPhysicsEngine2D.cs
index 512593c..e9947a8 100644
--- a/Engine.Physics2D/Abstract/IPhysicsEngine2D.cs
+++ b/Engine.Physics2D/Abstract/IPhysicsEngine2D.cs
@@ -8,12 +8,12 @@ public interface IPhysicsEngine2D
     /// <summary>
     /// Event triggered when the <see cref="IPhysicsEngine2D"/> has done a single physics iteration.
     /// </summary>
-    event OnPhysicsIterationEventHandler? OnPhysicsIteration;
+    event PhysicsIterationEventHandler? OnPhysicsIteration;
 
     /// <summary>
     /// Event triggered when the <see cref="IPhysicsEngine2D"/> has done a full physics step/>.
     /// </summary>
-    event OnPhysicsStepEventHandler? OnPhysicsStep;
+    event PhysicsStepEventHandler? OnPhysicsStep;
 
     /// <summary>
     /// The number of iterations the <see cref="IPhysicsEngine2D"/> performs per step.
@@ -26,6 +26,6 @@ public interface IPhysicsEngine2D
     /// <param name="deltaTime">The time step.</param>
     void Step(float deltaTime);
 
-    delegate void OnPhysicsIterationEventHandler(IPhysicsEngine2D sender, float iterationDeltaTime);
-    delegate void OnPhysicsStepEventHandler(IPhysicsEngine2D sender, float stepDeltaTime);
+    delegate void PhysicsIterationEventHandler(IPhysicsEngine2D sender, float iterationDeltaTime);
+    delegate void PhysicsStepEventHandler(IPhysicsEngine2D sender, float stepDeltaTime);
 }
diff --git a/Engine.Physics2D/Collider2DBehaviourBase.cs b/Engine.Physics2D/Collider2DBehaviourBase.cs
index bb7a329..1b64136 100644
--- a/Engine.Physics2D/Collider2DBehaviourBase.cs
+++ b/Engine.Physics2D/Collider2DBehaviourBase.cs
@@ -6,9 +6,9 @@ namespace Syntriax.Engine.Physics2D;
 
 public abstract class Collider2DBehaviourBase : Behaviour2D, ICollider2D
 {
-    public event ICollider2D.OnCollisionDetectedEventHandler? OnCollisionDetected = null;
-    public event ICollider2D.OnCollisionResolvedEventHandler? OnCollisionResolved = null;
-    public event ICollider2D.OnTriggeredEventHandler? OnTriggered = null;
+    public event ICollider2D.CollisionDetectedEventHandler? OnCollisionDetected = null;
+    public event ICollider2D.CollisionResolvedEventHandler? OnCollisionResolved = null;
+    public event ICollider2D.TriggeredEventHandler? OnTriggered = null;
 
     protected bool NeedsRecalculation { get; private set; } = true;
     protected IRigidBody2D? _rigidBody2D = null;
diff --git a/Engine.Physics2D/PhysicsEngine2D.cs b/Engine.Physics2D/PhysicsEngine2D.cs
index 11aa4f9..90c1b35 100644
--- a/Engine.Physics2D/PhysicsEngine2D.cs
+++ b/Engine.Physics2D/PhysicsEngine2D.cs
@@ -7,8 +7,8 @@ namespace Syntriax.Engine.Physics2D;
 
 public class PhysicsEngine2D : IPhysicsEngine2D
 {
-    public event IPhysicsEngine2D.OnPhysicsIterationEventHandler? OnPhysicsIteration = null;
-    public event IPhysicsEngine2D.OnPhysicsStepEventHandler? OnPhysicsStep = null;
+    public event IPhysicsEngine2D.PhysicsIterationEventHandler? OnPhysicsIteration = null;
+    public event IPhysicsEngine2D.PhysicsStepEventHandler? OnPhysicsStep = null;
 
     private readonly List<IRigidBody2D> rigidBodies = new(32);
     private readonly List<ICollider2D> colliders = new(64);
diff --git a/Engine.Physics2D/PhysicsEngine2DCollector.cs b/Engine.Physics2D/PhysicsEngine2DCollector.cs
index 59d9963..7f60be1 100644
--- a/Engine.Physics2D/PhysicsEngine2DCollector.cs
+++ b/Engine.Physics2D/PhysicsEngine2DCollector.cs
@@ -6,8 +6,8 @@ namespace Syntriax.Engine.Physics2D;
 
 public class PhysicsEngine2DCollector : HierarchyObject, IPhysicsEngine2D
 {
-    public event IPhysicsEngine2D.OnPhysicsIterationEventHandler? OnPhysicsIteration = null;
-    public event IPhysicsEngine2D.OnPhysicsStepEventHandler? OnPhysicsStep = null;
+    public event IPhysicsEngine2D.PhysicsIterationEventHandler? OnPhysicsIteration = null;
+    public event IPhysicsEngine2D.PhysicsStepEventHandler? OnPhysicsStep = null;
 
     private int _iterationPerStep = 1;
 
diff --git a/Engine.Systems/StateMachine/StateMachine.cs b/Engine.Systems/StateMachine/StateMachine.cs
index 791427f..4d5bda9 100644
--- a/Engine.Systems/StateMachine/StateMachine.cs
+++ b/Engine.Systems/StateMachine/StateMachine.cs
@@ -4,7 +4,7 @@ namespace Syntriax.Engine.StateMachine;
 
 public class StateMachine : Behaviour
 {
-    public event OnStateChangedEventHandler? OnStateChanged = null;
+    public event StateChangedEventHandler? OnStateChanged = null;
 
     private IState _state = new State();
     public IState State
@@ -45,5 +45,5 @@ public class StateMachine : Behaviour
         State.Update();
     }
 
-    public delegate void OnStateChangedEventHandler(StateMachine sender, IState previousState, IState newState);
+    public delegate void StateChangedEventHandler(StateMachine sender, IState previousState, IState newState);
 }