diff --git a/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs b/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
index 551953f4d4..d837ef8726 100644
--- a/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
+++ b/OpenRA.Mods.Cnc/Missions/Gdi01Script.cs
@@ -166,8 +166,8 @@ namespace OpenRA.Mods.Cnc
 		{
 			var self = Actors[ "Gunboat" ];
 			var mobile = self.Trait<Mobile>();
-			self.QueueActivity(mobile.MoveTo( Map.Waypoints["gunboatLeft"] ));
-			self.QueueActivity(mobile.MoveTo( Map.Waypoints["gunboatRight"] ));
+			self.QueueActivity(mobile.ScriptedMove( Map.Waypoints["gunboatLeft"] ));
+			self.QueueActivity(mobile.ScriptedMove( Map.Waypoints["gunboatRight"] ));
 			self.QueueActivity(new CallFunc(() => SetGunboatPath()));
 		}
 		
@@ -194,7 +194,7 @@ namespace OpenRA.Mods.Cnc
 					}));
 				
 				a.CancelActivity();
-				a.QueueActivity(mobile.MoveTo(endPos));
+				a.QueueActivity(mobile.ScriptedMove(endPos));
 				a.QueueActivity(new CallFunc(() =>
 				{
 					while (!cargo.IsEmpty(a))
@@ -210,7 +210,7 @@ namespace OpenRA.Mods.Cnc
 					}
 				}));
 				a.QueueActivity(new Wait(25));
-				a.QueueActivity(mobile.MoveTo(startPos));
+				a.QueueActivity(mobile.ScriptedMove(startPos));
 				a.QueueActivity(new RemoveSelf());
 			});
 		}
diff --git a/OpenRA.Mods.RA/Activities/Attack.cs b/OpenRA.Mods.RA/Activities/Attack.cs
index 3a10598a49..9462432ba7 100755
--- a/OpenRA.Mods.RA/Activities/Attack.cs
+++ b/OpenRA.Mods.RA/Activities/Attack.cs
@@ -43,7 +43,7 @@ namespace OpenRA.Mods.RA.Activities
 				return NextActivity;
 
 			if (!Combat.IsInRange( self.CenterLocation, Range, Target))
-				return Util.SequenceActivities( self.Trait<Mobile>().MoveTo( Target, Range ), this );
+				return Util.SequenceActivities( self.Trait<Mobile>().MoveWithinRange( Target, Range ), this );
 
 			var desiredFacing = Util.GetFacing(Target.CenterLocation - self.CenterLocation, 0);
 			var renderUnit = self.TraitOrDefault<RenderUnit>();
diff --git a/OpenRA.Mods.RA/Activities/Follow.cs b/OpenRA.Mods.RA/Activities/Follow.cs
index 6cbdda0a91..28af736ef8 100644
--- a/OpenRA.Mods.RA/Activities/Follow.cs
+++ b/OpenRA.Mods.RA/Activities/Follow.cs
@@ -35,7 +35,7 @@ namespace OpenRA.Mods.RA.Activities
 			if( inRange ) return this;
 
 			var mobile = self.Trait<Mobile>();
-			return Util.SequenceActivities( mobile.MoveTo( Target, Range ), this );
+			return Util.SequenceActivities( mobile.MoveWithinRange( Target, Range ), this );
 		}
 	}
 }
diff --git a/OpenRA.Mods.RA/Move/Mobile.cs b/OpenRA.Mods.RA/Move/Mobile.cs
index 75b2fc5469..ca19f906ee 100755
--- a/OpenRA.Mods.RA/Move/Mobile.cs
+++ b/OpenRA.Mods.RA/Move/Mobile.cs
@@ -373,11 +373,11 @@ namespace OpenRA.Mods.RA.Move
 			}
 		}
 
-		public IActivity MoveTo( int2 cell ) { return new Move( cell ); }
-		public IActivity MoveTo( int2 cell, int range ) { return new Move( cell, range ); }
+		public IActivity ScriptedMove( int2 cell ) { return new Move( cell ); }
+		public IActivity MoveTo( int2 cell, int nearEnough ) { return new Move( cell, nearEnough ); }
 		public IActivity MoveTo( int2 cell, Actor ignoredActor ) { return new Move( cell, ignoredActor ); }
-		public IActivity MoveTo( Actor target, int range ) { return new Move( target, range ); }
-		public IActivity MoveTo( Target target, int range ) { return new Move( target, range ); }
+		public IActivity MoveWithinRange( Actor target, int range ) { return new Move( target, range ); }
+		public IActivity MoveWithinRange( Target target, int range ) { return new Move( target, range ); }
 		public IActivity MoveTo( Func<List<int2>> pathFunc ) { return new Move( pathFunc ); }
 	}
 }
diff --git a/OpenRA.Mods.RA/Move/Move.cs b/OpenRA.Mods.RA/Move/Move.cs
index 4d99badb1e..7cfe873ee6 100755
--- a/OpenRA.Mods.RA/Move/Move.cs
+++ b/OpenRA.Mods.RA/Move/Move.cs
@@ -38,7 +38,7 @@ namespace OpenRA.Mods.RA.Move
 			this.nearEnough = 0;
 		}
 
-		public Move( int2 destination, int nearEnough )
+		public Move( int2 destination, int nearEnough ) 
 		{
 			this.getPath = (self,mobile) => self.World.WorldActor.Trait<PathFinder>().FindUnitPath( mobile.toCell, destination, self );
 			this.destination = destination;
diff --git a/OpenRA.Mods.RA/RepairableNear.cs b/OpenRA.Mods.RA/RepairableNear.cs
index 4bb5a875fd..77dce80950 100644
--- a/OpenRA.Mods.RA/RepairableNear.cs
+++ b/OpenRA.Mods.RA/RepairableNear.cs
@@ -66,7 +66,7 @@ namespace OpenRA.Mods.RA
 			{
 				var mobile = self.Trait<Mobile>();
 				self.CancelActivity();
-				self.QueueActivity(mobile.MoveTo(order.TargetActor, 1));
+				self.QueueActivity(mobile.MoveWithinRange(order.TargetActor, 1));
 				if (self.Owner == self.World.LocalPlayer)
 					self.World.AddFrameEndTask( w =>
 					{