diff --git a/Content.Server/GameObjects/Components/AnchorableComponent.cs b/Content.Server/GameObjects/Components/AnchorableComponent.cs
index b44ff8f767..00a2bca713 100644
--- a/Content.Server/GameObjects/Components/AnchorableComponent.cs
+++ b/Content.Server/GameObjects/Components/AnchorableComponent.cs
@@ -25,7 +25,7 @@ namespace Content.Server.GameObjects.Components
         public bool InteractUsing(InteractUsingEventArgs eventArgs)
         {
             if (!Owner.TryGetComponent(out PhysicsComponent physics)
-                || !eventArgs.AttackWith.TryGetComponent(out ToolComponent tool))
+                || !eventArgs.Using.TryGetComponent(out ToolComponent tool))
                 return false;
 
             if (!tool.UseTool(eventArgs.User, Owner, ToolQuality.Anchoring))
diff --git a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs b/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs
index 41c9d62eec..82c19dcc01 100644
--- a/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs
+++ b/Content.Server/GameObjects/Components/Doors/AirlockComponent.cs
@@ -202,7 +202,7 @@ namespace Content.Server.GameObjects.Components.Doors
 
         public bool InteractUsing(InteractUsingEventArgs eventArgs)
         {
-            if (!eventArgs.AttackWith.TryGetComponent<ToolComponent>(out var tool))
+            if (!eventArgs.Using.TryGetComponent<ToolComponent>(out var tool))
                 return false;
 
             if (!tool.UseTool(eventArgs.User, Owner, ToolQuality.Prying)) return false;
diff --git a/Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs b/Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs
index cc8a8d674a..32b87fa525 100644
--- a/Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs
+++ b/Content.Server/GameObjects/Components/Interactable/TilePryingComponent.cs
@@ -13,7 +13,7 @@ using Robust.Shared.Serialization;
 namespace Content.Server.GameObjects.Components.Interactable
 {
     [RegisterComponent]
-    public class TilePryingComponent : Component, IAfterAttack
+    public class TilePryingComponent : Component, IAfterInteract
     {
 #pragma warning disable 649
         [Dependency] private IEntitySystemManager _entitySystemManager;
@@ -26,7 +26,7 @@ namespace Content.Server.GameObjects.Components.Interactable
         public override string Name => "TilePrying";
         private bool _toolComponentNeeded = true;
 
-        public void AfterAttack(AfterAttackEventArgs eventArgs)
+        public void AfterInteract(AfterInteractEventArgs eventArgs)
         {
             TryPryTile(eventArgs.User, eventArgs.ClickLocation);
         }