diff --git a/OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs b/OpenRA.Mods.Cnc/Activities/TDHarvesterDockSequence.cs
similarity index 94%
rename from OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs
rename to OpenRA.Mods.Cnc/Activities/TDHarvesterDockSequence.cs
index 1ad3d8d8bd..7d06746beb 100644
--- a/OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs
+++ b/OpenRA.Mods.Cnc/Activities/TDHarvesterDockSequence.cs
@@ -13,13 +13,12 @@ using System.Collections.Generic;
 using OpenRA.Activities;
 using OpenRA.Mods.Common.Activities;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Cnc.Activities
 {
-	public class HarvesterDockSequence : Activity
+	public class TDHarvesterDockSequence : Activity
 	{
 		enum State { Wait, Turn, DragIn, Dock, Loop, Undock, DragOut }
 		static readonly WVec DockOffset = new WVec(-640, 341, 0);
@@ -30,7 +29,7 @@ namespace OpenRA.Mods.Cnc.Activities
 		State state;
 
 		WPos startDock, endDock;
-		public HarvesterDockSequence(Actor self, Actor proc)
+		public TDHarvesterDockSequence(Actor self, Actor proc)
 		{
 			this.proc = proc;
 			state = State.Turn;
diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
index 1798c1eeb1..3a68cef952 100644
--- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
+++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
@@ -67,7 +67,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Activities\HarvesterDockSequence.cs" />
+    <Compile Include="Activities\TDHarvesterDockSequence.cs" />
     <Compile Include="CncLoadScreen.cs" />
     <Compile Include="Effects\IonCannon.cs" />
     <Compile Include="Traits\AttackPopupTurreted.cs" />
diff --git a/OpenRA.Mods.Cnc/Traits/Buildings/TiberianDawnRefinery.cs b/OpenRA.Mods.Cnc/Traits/Buildings/TiberianDawnRefinery.cs
index 2b1cef2e96..1c91c952fa 100644
--- a/OpenRA.Mods.Cnc/Traits/Buildings/TiberianDawnRefinery.cs
+++ b/OpenRA.Mods.Cnc/Traits/Buildings/TiberianDawnRefinery.cs
@@ -25,7 +25,7 @@ namespace OpenRA.Mods.Cnc.Traits
 
 		public override Activity DockSequence(Actor harv, Actor self)
 		{
-			return new HarvesterDockSequence(harv, self);
+			return new TDHarvesterDockSequence(harv, self);
 		}
 	}
 }
diff --git a/OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs b/OpenRA.Mods.RA/Activities/HarvesterDockSequence.cs
similarity index 95%
rename from OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs
rename to OpenRA.Mods.RA/Activities/HarvesterDockSequence.cs
index 8e4fd91ca4..0c2775f7e0 100644
--- a/OpenRA.Mods.RA/Activities/RAHarvesterDockSequence.cs
+++ b/OpenRA.Mods.RA/Activities/HarvesterDockSequence.cs
@@ -18,7 +18,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
-	public class RAHarvesterDockSequence : Activity
+	public class HarvesterDockSequence : Activity
 	{
 		enum State { Wait, Turn, Dock, Loop, Undock, Complete }
 
@@ -28,7 +28,7 @@ namespace OpenRA.Mods.RA
 		readonly RenderUnit ru;
 		State state;
 
-		public RAHarvesterDockSequence(Actor self, Actor proc, int angle)
+		public HarvesterDockSequence(Actor self, Actor proc, int angle)
 		{
 			this.proc = proc;
 			this.angle = angle;
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index a1c3369154..40afa75aba 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -80,7 +80,7 @@
     <Compile Include="Activities\Infiltrate.cs" />
     <Compile Include="Activities\LayMines.cs" />
     <Compile Include="Activities\Leap.cs" />
-    <Compile Include="Activities\RAHarvesterDockSequence.cs" />
+    <Compile Include="Activities\HarvesterDockSequence.cs" />
     <Compile Include="Activities\Teleport.cs" />
     <Compile Include="AI\SupportPowerDecision.cs" />
     <Compile Include="Effects\GpsSatellite.cs" />
diff --git a/OpenRA.Mods.RA/Traits/Buildings/Refinery.cs b/OpenRA.Mods.RA/Traits/Buildings/Refinery.cs
index b61dd21490..c7c9e71025 100644
--- a/OpenRA.Mods.RA/Traits/Buildings/Refinery.cs
+++ b/OpenRA.Mods.RA/Traits/Buildings/Refinery.cs
@@ -59,7 +59,7 @@ namespace OpenRA.Mods.RA.Traits
 
 		public virtual Activity DockSequence(Actor harv, Actor self)
 		{
-			return new RAHarvesterDockSequence(harv, self, info.DockAngle);
+			return new HarvesterDockSequence(harv, self, info.DockAngle);
 		}
 
 		public IEnumerable<TraitPair<Harvester>> GetLinkedHarvesters()