diff --git a/OpenRA.Mods.Cnc/Traits/Render/WithReloadingSpriteTurret.cs b/OpenRA.Mods.Cnc/Traits/Render/WithReloadingSpriteTurret.cs
index 0a481efa88..511ea7a906 100644
--- a/OpenRA.Mods.Cnc/Traits/Render/WithReloadingSpriteTurret.cs
+++ b/OpenRA.Mods.Cnc/Traits/Render/WithReloadingSpriteTurret.cs
@@ -60,7 +60,7 @@ namespace OpenRA.Mods.Cnc.Traits.Render
 		protected override void Tick(Actor self)
 		{
 			if (Info.AimSequence != null)
-				sequence = Attack.IsAttacking ? Info.AimSequence : Info.Sequence;
+				sequence = Attack.IsAiming ? Info.AimSequence : Info.Sequence;
 
 			var currentAmmo = ammoPool.GetAmmoCount();
 			if (reloadStages < 0)
diff --git a/OpenRA.Mods.Common/Activities/Attack.cs b/OpenRA.Mods.Common/Activities/Attack.cs
index 9bb82d661d..60f934f03a 100644
--- a/OpenRA.Mods.Common/Activities/Attack.cs
+++ b/OpenRA.Mods.Common/Activities/Attack.cs
@@ -59,7 +59,7 @@ namespace OpenRA.Mods.Common.Activities
 			foreach (var attack in attackTraits.Where(x => !x.IsTraitDisabled))
 			{
 				var status = TickAttack(self, attack);
-				attack.IsAttacking = status == AttackStatus.Attacking || status == AttackStatus.NeedsToTurn;
+				attack.IsAiming = status == AttackStatus.Attacking || status == AttackStatus.NeedsToTurn;
 			}
 
 			if (attackStatus.HasFlag(AttackStatus.Attacking))
diff --git a/OpenRA.Mods.Common/Projectiles/AreaBeam.cs b/OpenRA.Mods.Common/Projectiles/AreaBeam.cs
index a0d43e20b6..d34a369f92 100644
--- a/OpenRA.Mods.Common/Projectiles/AreaBeam.cs
+++ b/OpenRA.Mods.Common/Projectiles/AreaBeam.cs
@@ -208,7 +208,7 @@ namespace OpenRA.Mods.Common.Projectiles
 			// While the head is travelling, the tail must start to follow Duration ticks later.
 			// Alternatively, also stop emitting the beam if source actor dies or is ordered to stop.
 			if ((headTicks >= info.Duration && !isTailTravelling) || args.SourceActor.IsDead ||
-				!actorAttackBase.IsAttacking || outOfWeaponRange)
+				!actorAttackBase.IsAiming || outOfWeaponRange)
 				StopTargeting();
 
 			if (isTailTravelling)
diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
index f018ecb26a..00b1c0521b 100644
--- a/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
+++ b/OpenRA.Mods.Common/Traits/Attack/AttackBase.cs
@@ -44,7 +44,7 @@ namespace OpenRA.Mods.Common.Traits
 		readonly string attackOrderName = "Attack";
 		readonly string forceAttackOrderName = "ForceAttack";
 
-		[Sync] public bool IsAttacking { get; internal set; }
+		[Sync] public bool IsAiming { get; internal set; }
 		public IEnumerable<Armament> Armaments { get { return getArmaments(); } }
 
 		protected IFacing facing;
diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs b/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
index e44c9b22f7..a4f5e34f5e 100644
--- a/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
+++ b/OpenRA.Mods.Common/Traits/Attack/AttackFollow.cs
@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Traits
 			}
 
 			DoAttack(self, Target);
-			IsAttacking = Target.IsValidFor(self);
+			IsAiming = Target.IsValidFor(self);
 		}
 
 		public override Activity GetAttackActivity(Actor self, Target newTarget, bool allowMove, bool forceAttack)
diff --git a/OpenRA.Mods.Common/Traits/Render/WithAttackAnimation.cs b/OpenRA.Mods.Common/Traits/Render/WithAttackAnimation.cs
index f9bd668e65..1bdf0a0af7 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithAttackAnimation.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithAttackAnimation.cs
@@ -110,7 +110,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 				return;
 
 			var sequence = wsb.Info.Sequence;
-			if (!string.IsNullOrEmpty(Info.AimSequence) && attack.IsAttacking)
+			if (!string.IsNullOrEmpty(Info.AimSequence) && attack.IsAiming)
 				sequence = Info.AimSequence;
 
 			var prefix = (armament.IsReloading && !string.IsNullOrEmpty(Info.ReloadPrefix)) ? Info.ReloadPrefix : "";
diff --git a/OpenRA.Mods.Common/Traits/Render/WithSpriteTurret.cs b/OpenRA.Mods.Common/Traits/Render/WithSpriteTurret.cs
index cbb7aeab27..49161300da 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithSpriteTurret.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithSpriteTurret.cs
@@ -124,7 +124,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 			if (Info.AimSequence == null)
 				return;
 
-			var sequence = Attack.IsAttacking ? Info.AimSequence : Info.Sequence;
+			var sequence = Attack.IsAiming ? Info.AimSequence : Info.Sequence;
 			DefaultAnimation.ReplaceAnim(sequence);
 		}
 
diff --git a/OpenRA.Mods.Common/Traits/Render/WithTurretAttackAnimation.cs b/OpenRA.Mods.Common/Traits/Render/WithTurretAttackAnimation.cs
index 254185afa0..4ca7810a90 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithTurretAttackAnimation.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithTurretAttackAnimation.cs
@@ -96,7 +96,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 				return;
 
 			var sequence = wst.Info.Sequence;
-			if (!string.IsNullOrEmpty(info.AimSequence) && attack.IsAttacking)
+			if (!string.IsNullOrEmpty(info.AimSequence) && attack.IsAiming)
 				sequence = info.AimSequence;
 
 			var prefix = (armament.IsReloading && !string.IsNullOrEmpty(info.ReloadPrefix)) ? info.ReloadPrefix : "";
diff --git a/OpenRA.Mods.Common/Traits/Turreted.cs b/OpenRA.Mods.Common/Traits/Turreted.cs
index 07ec791f04..9b870cf40e 100644
--- a/OpenRA.Mods.Common/Traits/Turreted.cs
+++ b/OpenRA.Mods.Common/Traits/Turreted.cs
@@ -117,7 +117,7 @@ namespace OpenRA.Mods.Common.Traits
 			if (attack != null)
 			{
 				// Only realign while not attacking anything
-				if (attack.IsAttacking)
+				if (attack.IsAiming)
 					return;
 
 				if (realignTick < Info.RealignDelay)