diff --git a/Content.Server/Body/Systems/BrainSystem.cs b/Content.Server/Body/Systems/BrainSystem.cs
index 7e2bb1d67a7d2a..86d2cb61ffe931 100644
--- a/Content.Server/Body/Systems/BrainSystem.cs
+++ b/Content.Server/Body/Systems/BrainSystem.cs
@@ -16,8 +16,8 @@ public override void Initialize()
         {
             base.Initialize();
 
-            SubscribeLocalEvent<BrainComponent, AddedToPartInBodyEvent>((uid, _, args) => HandleMind(args.Body, uid));
-            SubscribeLocalEvent<BrainComponent, RemovedFromPartInBodyEvent>((uid, _, args) => HandleMind(uid, args.OldBody));
+            SubscribeLocalEvent<BrainComponent, OrganAddedToBodyEvent>((uid, _, args) => HandleMind(args.Body, uid));
+            SubscribeLocalEvent<BrainComponent, OrganRemovedFromBodyEvent>((uid, _, args) => HandleMind(uid, args.OldBody));
             SubscribeLocalEvent<BrainComponent, PointAttemptEvent>(OnPointAttempt);
         }
 
diff --git a/Content.Server/Species/Systems/NymphSystem.cs b/Content.Server/Species/Systems/NymphSystem.cs
index 8d0646ae8e4677..488e06bf018b3c 100644
--- a/Content.Server/Species/Systems/NymphSystem.cs
+++ b/Content.Server/Species/Systems/NymphSystem.cs
@@ -16,10 +16,10 @@ public override void Initialize()
     {
         base.Initialize();
 
-        SubscribeLocalEvent<NymphComponent, RemovedFromPartInBodyEvent>(OnRemovedFromPart);
+        SubscribeLocalEvent<NymphComponent, OrganRemovedFromBodyEvent>(OnRemovedFromPart);
     }
 
-    private void OnRemovedFromPart(EntityUid uid, NymphComponent comp, RemovedFromPartInBodyEvent args)
+    private void OnRemovedFromPart(EntityUid uid, NymphComponent comp, ref OrganRemovedFromBodyEvent args)
     {
         if (!_timing.IsFirstTimePredicted)
             return;
diff --git a/Content.Shared/Body/Events/MechanismBodyEvents.cs b/Content.Shared/Body/Events/MechanismBodyEvents.cs
index 9cbec941fb4c0a..968b172aef5e99 100644
--- a/Content.Shared/Body/Events/MechanismBodyEvents.cs
+++ b/Content.Shared/Body/Events/MechanismBodyEvents.cs
@@ -4,25 +4,25 @@ namespace Content.Shared.Body.Events;
 // ways.
 
 /// <summary>
-///     Raised on a mechanism when it is added to a body part.
+/// Raised on a mechanism when it is added to a body part.
 /// </summary>
 [ByRefEvent]
-public readonly record struct AddedToPartEvent(EntityUid Part);
+public readonly record struct OrganAddedEvent(EntityUid Part);
 
 /// <summary>
-///     Raised on a mechanism when it is added to a body part within a body.
+/// Raised on a mechanism when it is added to a body part within a body.
 /// </summary>
 [ByRefEvent]
-public readonly record struct AddedToPartInBodyEvent(EntityUid Body, EntityUid Part);
+public readonly record struct OrganAddedToBodyEvent(EntityUid Body, EntityUid Part);
 
 /// <summary>
-///     Raised on a mechanism when it is removed from a body part.
+/// Raised on a mechanism when it is removed from a body part.
 /// </summary>
 [ByRefEvent]
-public readonly record struct RemovedFromPartEvent(EntityUid OldPart);
+public readonly record struct OrganRemovedEvent(EntityUid OldPart);
 
 /// <summary>
-///     Raised on a mechanism when it is removed from a body part within a body.
+/// Raised on a mechanism when it is removed from a body part within a body.
 /// </summary>
 [ByRefEvent]
-public readonly record struct RemovedFromPartInBodyEvent(EntityUid OldBody, EntityUid OldPart);
+public readonly record struct OrganRemovedFromBodyEvent(EntityUid OldBody, EntityUid OldPart);
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
index 3efcd9850a488c..efabebfc858bfe 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Organs.cs
@@ -15,12 +15,12 @@ private void AddOrgan(
         EntityUid parentPartUid)
     {
         organEnt.Comp.Body = bodyUid;
-        var addedEv = new AddedToPartEvent(parentPartUid);
+        var addedEv = new OrganAddedEvent(parentPartUid);
         RaiseLocalEvent(organEnt, ref addedEv);
 
         if (organEnt.Comp.Body is not null)
         {
-            var addedInBodyEv = new AddedToPartInBodyEvent(bodyUid, parentPartUid);
+            var addedInBodyEv = new OrganAddedToBodyEvent(bodyUid, parentPartUid);
             RaiseLocalEvent(organEnt, ref addedInBodyEv);
         }
 
@@ -29,12 +29,12 @@ private void AddOrgan(
 
     private void RemoveOrgan(Entity<OrganComponent> organEnt, EntityUid parentPartUid)
     {
-        var removedEv = new RemovedFromPartEvent(parentPartUid);
+        var removedEv = new OrganRemovedEvent(parentPartUid);
         RaiseLocalEvent(organEnt, ref removedEv);
 
         if (organEnt.Comp.Body is { Valid: true } bodyUid)
         {
-            var removedInBodyEv = new RemovedFromPartInBodyEvent(bodyUid, parentPartUid);
+            var removedInBodyEv = new OrganRemovedFromBodyEvent(bodyUid, parentPartUid);
             RaiseLocalEvent(organEnt, ref removedInBodyEv);
         }
 
diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
index 50aa82341270e2..ee79faa0b8e7ab 100644
--- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
+++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs
@@ -80,14 +80,14 @@ private void RecursiveBodyUpdate(Entity<BodyPartComponent> ent, EntityUid? bodyU
 
                 if (organComp.Body is { Valid: true } oldBodyUid)
                 {
-                    var removedEv = new RemovedFromPartInBodyEvent(oldBodyUid, ent);
+                    var removedEv = new OrganRemovedFromBodyEvent(oldBodyUid, ent);
                     RaiseLocalEvent(organ, ref removedEv);
                 }
 
                 organComp.Body = bodyUid;
                 if (bodyUid is not null)
                 {
-                    var addedEv = new AddedToPartInBodyEvent(bodyUid.Value, ent);
+                    var addedEv = new OrganAddedToBodyEvent(bodyUid.Value, ent);
                     RaiseLocalEvent(organ, ref addedEv);
                 }
             }