diff --git a/OpenRA.Mods.Cnc/Activities/Infiltrate.cs b/OpenRA.Mods.Cnc/Activities/Infiltrate.cs
index 38c068e9a9..d991fa643a 100644
--- a/OpenRA.Mods.Cnc/Activities/Infiltrate.cs
+++ b/OpenRA.Mods.Cnc/Activities/Infiltrate.cs
@@ -19,7 +19,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Cnc.Activities
 {
-	class Infiltrate : Enter
+	class Infiltrate : LegacyEnter
 	{
 		readonly Actor target;
 		readonly Infiltrates infiltrates;
diff --git a/OpenRA.Mods.Common/Activities/CaptureActor.cs b/OpenRA.Mods.Common/Activities/CaptureActor.cs
index 2274992772..4b3f697103 100644
--- a/OpenRA.Mods.Common/Activities/CaptureActor.cs
+++ b/OpenRA.Mods.Common/Activities/CaptureActor.cs
@@ -16,7 +16,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Activities
 {
-	public class CaptureActor : Enter
+	public class CaptureActor : LegacyEnter
 	{
 		readonly Actor actor;
 		readonly CaptureManager targetManager;
diff --git a/OpenRA.Mods.Common/Activities/Demolish.cs b/OpenRA.Mods.Common/Activities/Demolish.cs
index adadf48be0..9b785ec116 100644
--- a/OpenRA.Mods.Common/Activities/Demolish.cs
+++ b/OpenRA.Mods.Common/Activities/Demolish.cs
@@ -16,7 +16,7 @@ using OpenRA.Mods.Common.Traits;
 
 namespace OpenRA.Mods.Common.Activities
 {
-	class Demolish : Enter
+	class Demolish : LegacyEnter
 	{
 		readonly Actor target;
 		readonly IDemolishable[] demolishables;
diff --git a/OpenRA.Mods.Common/Activities/DonateCash.cs b/OpenRA.Mods.Common/Activities/DonateCash.cs
index aacfdb07b9..e44f943e49 100644
--- a/OpenRA.Mods.Common/Activities/DonateCash.cs
+++ b/OpenRA.Mods.Common/Activities/DonateCash.cs
@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Traits;
 
 namespace OpenRA.Mods.Common.Activities
 {
-	class DonateCash : Enter
+	class DonateCash : LegacyEnter
 	{
 		readonly Actor target;
 		readonly int payload;
diff --git a/OpenRA.Mods.Common/Activities/DonateExperience.cs b/OpenRA.Mods.Common/Activities/DonateExperience.cs
index cc692bed67..729ea07138 100644
--- a/OpenRA.Mods.Common/Activities/DonateExperience.cs
+++ b/OpenRA.Mods.Common/Activities/DonateExperience.cs
@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Traits;
 
 namespace OpenRA.Mods.Common.Activities
 {
-	class DonateExperience : Enter
+	class DonateExperience : LegacyEnter
 	{
 		readonly Actor target;
 		readonly GainsExperience targetGainsExperience;
diff --git a/OpenRA.Mods.Common/Activities/EnterTransport.cs b/OpenRA.Mods.Common/Activities/EnterTransport.cs
index e688739c09..50fdaec5cc 100644
--- a/OpenRA.Mods.Common/Activities/EnterTransport.cs
+++ b/OpenRA.Mods.Common/Activities/EnterTransport.cs
@@ -16,7 +16,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Activities
 {
-	class EnterTransport : Enter
+	class EnterTransport : LegacyEnter
 	{
 		readonly Passenger passenger;
 		readonly int maxTries;
diff --git a/OpenRA.Mods.Common/Activities/Enter.cs b/OpenRA.Mods.Common/Activities/LegacyEnter.cs
similarity index 98%
rename from OpenRA.Mods.Common/Activities/Enter.cs
rename to OpenRA.Mods.Common/Activities/LegacyEnter.cs
index eb86996c94..9b5837496d 100644
--- a/OpenRA.Mods.Common/Activities/Enter.cs
+++ b/OpenRA.Mods.Common/Activities/LegacyEnter.cs
@@ -20,7 +20,7 @@ namespace OpenRA.Mods.Common.Activities
 {
 	public enum EnterBehaviour { Exit, Suicide, Dispose }
 
-	public abstract class Enter : Activity
+	public abstract class LegacyEnter : Activity
 	{
 		public enum ReserveStatus { None, TooFar, Pending, Ready }
 		enum EnterState { ApproachingOrEntering, WaitingToEnter, Inside, Exiting, Done }
@@ -39,7 +39,7 @@ namespace OpenRA.Mods.Common.Activities
 		Activity inner;
 		bool firstApproach = true;
 
-		protected Enter(Actor self, Actor target, EnterBehaviour enterBehaviour, int maxTries = 1,
+		protected LegacyEnter(Actor self, Actor target, EnterBehaviour enterBehaviour, int maxTries = 1,
 			bool repathWhileMoving = true, Color? targetLineColor = null)
 		{
 			move = self.Trait<IMove>();
diff --git a/OpenRA.Mods.Common/Activities/RepairBridge.cs b/OpenRA.Mods.Common/Activities/RepairBridge.cs
index 93d7e0c340..3ca19a356a 100644
--- a/OpenRA.Mods.Common/Activities/RepairBridge.cs
+++ b/OpenRA.Mods.Common/Activities/RepairBridge.cs
@@ -15,7 +15,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Activities
 {
-	class RepairBridge : Enter
+	class RepairBridge : LegacyEnter
 	{
 		readonly Actor target;
 		readonly LegacyBridgeHut legacyHut;
diff --git a/OpenRA.Mods.Common/Activities/RepairBuilding.cs b/OpenRA.Mods.Common/Activities/RepairBuilding.cs
index a5b6e3dde1..1822b5e661 100644
--- a/OpenRA.Mods.Common/Activities/RepairBuilding.cs
+++ b/OpenRA.Mods.Common/Activities/RepairBuilding.cs
@@ -14,7 +14,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Activities
 {
-	class RepairBuilding : Enter
+	class RepairBuilding : LegacyEnter
 	{
 		readonly Actor target;
 		readonly IHealth health;
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 1ab61e7010..8c3df4e4cd 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -91,7 +91,7 @@
     <Compile Include="Activities\DeployForGrantedCondition.cs" />
     <Compile Include="Activities\DonateCash.cs" />
     <Compile Include="Activities\DonateExperience.cs" />
-    <Compile Include="Activities\Enter.cs" />
+    <Compile Include="Activities\LegacyEnter.cs" />
     <Compile Include="Activities\EnterTransport.cs" />
     <Compile Include="Activities\FindResources.cs" />
     <Compile Include="Activities\HarvestResource.cs" />