diff --git a/OpenRA.Game/Graphics/Viewport.cs b/OpenRA.Game/Graphics/Viewport.cs
index 25e4621d99..d67e9d37c1 100644
--- a/OpenRA.Game/Graphics/Viewport.cs
+++ b/OpenRA.Game/Graphics/Viewport.cs
@@ -247,7 +247,7 @@ namespace OpenRA.Graphics
 			}
 
 			// Cells can be pushed up from below if they have non-zero height.
-			// Each height step is equivalent to 512 WRange units, which is
+			// Each height step is equivalent to 512 WDist units, which is
 			// one MPos step for diamond cells, but only half a MPos step
 			// for classic cells. Doh!
 			var heightOffset = map.TileShape == TileShape.Diamond ? map.MaximumTerrainHeight : map.MaximumTerrainHeight / 2;
diff --git a/OpenRA.Mods.Common/Effects/Bullet.cs b/OpenRA.Mods.Common/Effects/Bullet.cs
index af3903b151..5f7d1c702e 100644
--- a/OpenRA.Mods.Common/Effects/Bullet.cs
+++ b/OpenRA.Mods.Common/Effects/Bullet.cs
@@ -22,7 +22,7 @@ namespace OpenRA.Mods.Common.Effects
 {
 	public class BulletInfo : IProjectileInfo
 	{
-		[Desc("Projectile speed in WRange / tick, two values indicate variable velocity.")]
+		[Desc("Projectile speed in WDist / tick, two values indicate variable velocity.")]
 		public readonly WDist[] Speed = { new WDist(17) };
 		[Desc("Maximum offset at the maximum range.")]
 		public readonly WDist Inaccuracy = WDist.Zero;
diff --git a/OpenRA.Mods.Common/Effects/Missile.cs b/OpenRA.Mods.Common/Effects/Missile.cs
index a05f1521dd..170688f28f 100644
--- a/OpenRA.Mods.Common/Effects/Missile.cs
+++ b/OpenRA.Mods.Common/Effects/Missile.cs
@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Effects
 		[SequenceReference("Image")] public readonly string Sequence = "idle";
 		public readonly string Palette = "effect";
 		public readonly bool Shadow = false;
-		[Desc("Projectile speed in WRange / tick")]
+		[Desc("Projectile speed in WDist / tick")]
 		public readonly WDist Speed = new WDist(8);
 		[Desc("Maximum vertical pitch when changing altitude.")]
 		public readonly WAngle MaximumPitch = WAngle.FromDegrees(30);
diff --git a/OpenRA.Mods.Common/Scripting/Global/CoordinateGlobals.cs b/OpenRA.Mods.Common/Scripting/Global/CoordinateGlobals.cs
index c75bda6eee..6fa8accb8a 100644
--- a/OpenRA.Mods.Common/Scripting/Global/CoordinateGlobals.cs
+++ b/OpenRA.Mods.Common/Scripting/Global/CoordinateGlobals.cs
@@ -59,15 +59,15 @@ namespace OpenRA.Mods.Common.Scripting
 		public WVec Zero { get { return WVec.Zero; } }
 	}
 
-	[ScriptGlobal("WRange")]
+	[ScriptGlobal("WDist")]
 	public class WRangeGlobal : ScriptGlobal
 	{
 		public WRangeGlobal(ScriptContext context) : base(context) { }
 
-		[Desc("Create a new WRange.")]
+		[Desc("Create a new WDist.")]
 		public WDist New(int r) { return new WDist(r); }
 
-		[Desc("Create a new WRange by cell distance")]
+		[Desc("Create a new WDist by cell distance")]
 		public WDist FromCells(int numCells) { return WDist.FromCells(numCells); }
 	}
 }
diff --git a/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs b/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs
index bc3690f58f..ac3548ffdd 100644
--- a/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs
+++ b/OpenRA.Mods.Common/Traits/SupportPowers/NukePower.cs
@@ -26,7 +26,7 @@ namespace OpenRA.Mods.Common.Traits
 		[Desc("Travel time - split equally between ascent and descent")]
 		public readonly int FlightDelay = 400;
 
-		[Desc("Visual ascent velocity in WRange / tick")]
+		[Desc("Visual ascent velocity in WDist / tick")]
 		public readonly WDist FlightVelocity = new WDist(512);
 
 		[Desc("Descend immediately on the target, with half the FlightDelay")]