diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
index 8be3ae3637..f1ec2a9372 100644
--- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
+++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj
@@ -90,6 +90,10 @@
     <Compile Include="UtilityCommands\LegacyRulesImporter.cs" />
     <Compile Include="UtilityCommands\LegacySequenceImporter.cs" />
     <Compile Include="Widgets\Logic\PreReleaseWarningPrompt.cs" />
+    <Compile Include="Traits\Attack\AttackTesla.cs" />
+    <Compile Include="Traits\Render\WithTeslaChargeAnimation.cs" />
+    <Compile Include="Traits\Render\WithTeslaChargeOverlay.cs" />
+    <Compile Include="TraitsInterfaces.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">
diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackCharge.cs b/OpenRA.Mods.Cnc/Traits/Attack/AttackTesla.cs
similarity index 82%
rename from OpenRA.Mods.Common/Traits/Attack/AttackCharge.cs
rename to OpenRA.Mods.Cnc/Traits/Attack/AttackTesla.cs
index 736121f470..059328a342 100644
--- a/OpenRA.Mods.Common/Traits/Attack/AttackCharge.cs
+++ b/OpenRA.Mods.Cnc/Traits/Attack/AttackTesla.cs
@@ -11,12 +11,13 @@
 
 using OpenRA.Activities;
 using OpenRA.Mods.Common.Activities;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Traits
+namespace OpenRA.Mods.Cnc.Traits
 {
-	[Desc("Charges up before being able to attack.")]
-	class AttackChargeInfo : AttackOmniInfo
+	[Desc("Implements the charge-then-burst attack logic specific to the RA tesla coil.")]
+	class AttackTeslaInfo : AttackOmniInfo
 	{
 		[Desc("How many charges this actor has to attack with, once charged.")]
 		public readonly int MaxCharges = 1;
@@ -33,17 +34,17 @@ namespace OpenRA.Mods.Common.Traits
 		[Desc("Sound to play when actor charges.")]
 		public readonly string ChargeAudio = null;
 
-		public override object Create(ActorInitializer init) { return new AttackCharge(init.Self, this); }
+		public override object Create(ActorInitializer init) { return new AttackTesla(init.Self, this); }
 	}
 
-	class AttackCharge : AttackOmni, ITick, INotifyAttack
+	class AttackTesla : AttackOmni, ITick, INotifyAttack
 	{
-		readonly AttackChargeInfo info;
+		readonly AttackTeslaInfo info;
 
 		[Sync] int charges;
 		[Sync] int timeToRecharge;
 
-		public AttackCharge(Actor self, AttackChargeInfo info)
+		public AttackTesla(Actor self, AttackTeslaInfo info)
 			: base(self, info)
 		{
 			this.info = info;
@@ -79,10 +80,10 @@ namespace OpenRA.Mods.Common.Traits
 
 		class ChargeAttack : Activity
 		{
-			readonly AttackCharge attack;
+			readonly AttackTesla attack;
 			readonly Target target;
 
-			public ChargeAttack(AttackCharge attack, Target target)
+			public ChargeAttack(AttackTesla attack, Target target)
 			{
 				this.attack = attack;
 				this.target = target;
@@ -96,7 +97,7 @@ namespace OpenRA.Mods.Common.Traits
 				if (attack.charges == 0)
 					return this;
 
-				foreach (var notify in self.TraitsImplementing<INotifyCharging>())
+				foreach (var notify in self.TraitsImplementing<INotifyTeslaCharging>())
 					notify.Charging(self, target);
 
 				if (!string.IsNullOrEmpty(attack.info.ChargeAudio))
@@ -108,10 +109,10 @@ namespace OpenRA.Mods.Common.Traits
 
 		class ChargeFire : Activity
 		{
-			readonly AttackCharge attack;
+			readonly AttackTesla attack;
 			readonly Target target;
 
-			public ChargeFire(AttackCharge attack, Target target)
+			public ChargeFire(AttackTesla attack, Target target)
 			{
 				this.attack = attack;
 				this.target = target;
diff --git a/OpenRA.Mods.Common/Traits/Render/WithChargeAnimation.cs b/OpenRA.Mods.Cnc/Traits/Render/WithTeslaChargeAnimation.cs
similarity index 60%
rename from OpenRA.Mods.Common/Traits/Render/WithChargeAnimation.cs
rename to OpenRA.Mods.Cnc/Traits/Render/WithTeslaChargeAnimation.cs
index 1efe00c84c..abc6b21584 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithChargeAnimation.cs
+++ b/OpenRA.Mods.Cnc/Traits/Render/WithTeslaChargeAnimation.cs
@@ -9,31 +9,32 @@
  */
 #endregion
 
+using OpenRA.Mods.Common.Traits.Render;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Traits.Render
+namespace OpenRA.Mods.Cnc.Traits.Render
 {
 	[Desc("This actor displays a charge-up animation before firing.")]
-	public class WithChargeAnimationInfo : ITraitInfo, Requires<WithSpriteBodyInfo>, Requires<RenderSpritesInfo>
+	public class WithTeslaChargeAnimationInfo : ITraitInfo, Requires<WithSpriteBodyInfo>, Requires<RenderSpritesInfo>
 	{
 		[Desc("Sequence to use for charge animation.")]
 		[SequenceReference] public readonly string ChargeSequence = "active";
 
-		public object Create(ActorInitializer init) { return new WithChargeAnimation(init, this); }
+		public object Create(ActorInitializer init) { return new WithTeslaChargeAnimation(init, this); }
 	}
 
-	public class WithChargeAnimation : INotifyCharging
+	public class WithTeslaChargeAnimation : INotifyTeslaCharging
 	{
-		readonly WithChargeAnimationInfo info;
+		readonly WithTeslaChargeAnimationInfo info;
 		readonly WithSpriteBody wsb;
 
-		public WithChargeAnimation(ActorInitializer init, WithChargeAnimationInfo info)
+		public WithTeslaChargeAnimation(ActorInitializer init, WithTeslaChargeAnimationInfo info)
 		{
 			this.info = info;
 			wsb = init.Self.Trait<WithSpriteBody>();
 		}
 
-		public void Charging(Actor self, Target target)
+		void INotifyTeslaCharging.Charging(Actor self, Target target)
 		{
 			wsb.PlayCustomAnimation(self, info.ChargeSequence, () => wsb.CancelCustomAnimation(self));
 		}
diff --git a/OpenRA.Mods.Common/Traits/Render/WithChargeOverlay.cs b/OpenRA.Mods.Cnc/Traits/Render/WithTeslaChargeOverlay.cs
similarity index 73%
rename from OpenRA.Mods.Common/Traits/Render/WithChargeOverlay.cs
rename to OpenRA.Mods.Cnc/Traits/Render/WithTeslaChargeOverlay.cs
index d3d718dc20..4403cc2abc 100644
--- a/OpenRA.Mods.Common/Traits/Render/WithChargeOverlay.cs
+++ b/OpenRA.Mods.Cnc/Traits/Render/WithTeslaChargeOverlay.cs
@@ -10,12 +10,14 @@
 #endregion
 
 using OpenRA.Graphics;
+using OpenRA.Mods.Common.Traits;
+using OpenRA.Mods.Common.Traits.Render;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Traits.Render
+namespace OpenRA.Mods.Cnc.Traits.Render
 {
 	[Desc("Rendered together with AttackCharge.")]
-	public class WithChargeOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>
+	public class WithTeslaChargeOverlayInfo : ITraitInfo, Requires<RenderSpritesInfo>
 	{
 		[Desc("Sequence name to use")]
 		[SequenceReference] public readonly string Sequence = "active";
@@ -26,18 +28,18 @@ namespace OpenRA.Mods.Common.Traits.Render
 		[Desc("Custom palette is a player palette BaseName")]
 		public readonly bool IsPlayerPalette = false;
 
-		public object Create(ActorInitializer init) { return new WithChargeOverlay(init, this); }
+		public object Create(ActorInitializer init) { return new WithTeslaChargeOverlay(init, this); }
 	}
 
-	public class WithChargeOverlay : INotifyCharging, INotifyDamageStateChanged, INotifySold
+	public class WithTeslaChargeOverlay : INotifyTeslaCharging, INotifyDamageStateChanged, INotifySold
 	{
 		readonly Animation overlay;
 		readonly RenderSprites renderSprites;
-		readonly WithChargeOverlayInfo info;
+		readonly WithTeslaChargeOverlayInfo info;
 
 		bool charging;
 
-		public WithChargeOverlay(ActorInitializer init, WithChargeOverlayInfo info)
+		public WithTeslaChargeOverlay(ActorInitializer init, WithTeslaChargeOverlayInfo info)
 		{
 			this.info = info;
 
@@ -49,7 +51,7 @@ namespace OpenRA.Mods.Common.Traits.Render
 				info.Palette, info.IsPlayerPalette);
 		}
 
-		void INotifyCharging.Charging(Actor self, Target target)
+		void INotifyTeslaCharging.Charging(Actor self, Target target)
 		{
 			charging = true;
 			overlay.PlayThen(RenderSprites.NormalizeSequence(overlay, self.GetDamageState(), info.Sequence), () => charging = false);
diff --git a/OpenRA.Mods.Cnc/TraitsInterfaces.cs b/OpenRA.Mods.Cnc/TraitsInterfaces.cs
new file mode 100644
index 0000000000..ca46f299c7
--- /dev/null
+++ b/OpenRA.Mods.Cnc/TraitsInterfaces.cs
@@ -0,0 +1,18 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2017 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Cnc.Traits
+{
+	[RequireExplicitImplementation]
+	public interface INotifyTeslaCharging { void Charging(Actor self, Target target); }
+}
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index ef7508cd05..5402022467 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -262,7 +262,6 @@
     <Compile Include="Traits\Armor.cs" />
     <Compile Include="Traits\AttackMove.cs" />
     <Compile Include="Traits\Attack\AttackBase.cs" />
-    <Compile Include="Traits\Attack\AttackCharge.cs" />
     <Compile Include="Traits\Attack\AttackFollow.cs" />
     <Compile Include="Traits\Attack\AttackFrontal.cs" />
     <Compile Include="Traits\Attack\AttackGarrisoned.cs" />
@@ -431,8 +430,6 @@
     <Compile Include="Traits\Render\WithSiloAnimation.cs" />
     <Compile Include="Traits\Render\WithBuildingPlacedAnimation.cs" />
     <Compile Include="Traits\Render\WithMakeAnimation.cs" />
-    <Compile Include="Traits\Render\WithChargeAnimation.cs" />
-    <Compile Include="Traits\Render\WithChargeOverlay.cs" />
     <Compile Include="Traits\Render\WithCrateBody.cs" />
     <Compile Include="Traits\Render\WithDamageOverlay.cs" />
     <Compile Include="Traits\Render\WithDeathAnimation.cs" />
diff --git a/OpenRA.Mods.Common/Traits/Attack/AttackOmni.cs b/OpenRA.Mods.Common/Traits/Attack/AttackOmni.cs
index fad08c4fcd..74de70d3bb 100644
--- a/OpenRA.Mods.Common/Traits/Attack/AttackOmni.cs
+++ b/OpenRA.Mods.Common/Traits/Attack/AttackOmni.cs
@@ -14,12 +14,12 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.Traits
 {
-	class AttackOmniInfo : AttackBaseInfo
+	public class AttackOmniInfo : AttackBaseInfo
 	{
 		public override object Create(ActorInitializer init) { return new AttackOmni(init.Self, this); }
 	}
 
-	class AttackOmni : AttackBase
+	public class AttackOmni : AttackBase
 	{
 		public AttackOmni(Actor self, AttackOmniInfo info)
 			: base(self, info) { }
diff --git a/OpenRA.Mods.Common/TraitsInterfaces.cs b/OpenRA.Mods.Common/TraitsInterfaces.cs
index 168598488b..14cc4bfb93 100644
--- a/OpenRA.Mods.Common/TraitsInterfaces.cs
+++ b/OpenRA.Mods.Common/TraitsInterfaces.cs
@@ -81,7 +81,6 @@ namespace OpenRA.Mods.Common.Traits
 	public interface INotifyBuildingPlaced { void BuildingPlaced(Actor self); }
 	public interface INotifyRepair { void Repairing(Actor self, Actor target); }
 	public interface INotifyBurstComplete { void FiredBurst(Actor self, Target target, Armament a); }
-	public interface INotifyCharging { void Charging(Actor self, Target target); }
 	public interface INotifyChat { bool OnChat(string from, string message); }
 	public interface INotifyProduction { void UnitProduced(Actor self, Actor other, CPos exit); }
 	public interface INotifyOtherProduction { void UnitProducedByOther(Actor self, Actor producer, Actor produced); }
diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
index d02e6e9daa..bdb516b027 100644
--- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
@@ -818,6 +818,18 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					}
 				}
 
+				if (engineVersion < 20170210)
+				{
+					if (node.Key.StartsWith("AttackCharge", StringComparison.Ordinal))
+						RenameNodeKey(node, "AttackTesla");
+
+					if (node.Key.StartsWith("WithChargeOverlay", StringComparison.Ordinal))
+						RenameNodeKey(node, "WithTeslaChargeOverlay");
+
+					if (node.Key.StartsWith("WithChargeAnimation", StringComparison.Ordinal))
+						RenameNodeKey(node, "WithTeslaChargeAnimation");
+				}
+
 				UpgradeActorRules(modData, engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
 
diff --git a/mods/cnc/rules/structures.yaml b/mods/cnc/rules/structures.yaml
index e7309de5cc..5e6ea17e3b 100644
--- a/mods/cnc/rules/structures.yaml
+++ b/mods/cnc/rules/structures.yaml
@@ -758,12 +758,12 @@ OBLI:
 		Range: 8c0
 	Bib:
 		HasMinibib: Yes
-	WithChargeAnimation:
+	WithTeslaChargeAnimation:
 	Armament:
 		Weapon: Laser
 		LocalOffset: 0,-85,1280
 		FireDelay: 0
-	AttackCharge:
+	AttackTesla:
 		ChargeAudio: obelpowr.aud
 		ReloadDelay: 40
 		InitialChargeDelay: 50
diff --git a/mods/ra/rules/structures.yaml b/mods/ra/rules/structures.yaml
index cf797c06a6..9930d38ebc 100644
--- a/mods/ra/rules/structures.yaml
+++ b/mods/ra/rules/structures.yaml
@@ -436,11 +436,11 @@ TSLA:
 		Range: 6c0
 	Bib:
 		HasMinibib: Yes
-	WithChargeAnimation:
+	WithTeslaChargeAnimation:
 	Armament:
 		Weapon: TeslaZap
 		LocalOffset: 0,0,896
-	AttackCharge:
+	AttackTesla:
 		ChargeAudio: tslachg2.aud
 		MaxCharges: 3
 		ReloadDelay: 120
diff --git a/mods/ts/rules/nod-support.yaml b/mods/ts/rules/nod-support.yaml
index 4c642e930a..cab377a04a 100644
--- a/mods/ts/rules/nod-support.yaml
+++ b/mods/ts/rules/nod-support.yaml
@@ -108,10 +108,10 @@ NAOBEL:
 	Armament:
 		Weapon: ObeliskLaserFire
 		LocalOffset: 1400,210,800
-	AttackCharge:
+	AttackTesla:
 		ChargeAudio: obelpowr.aud
 		InitialChargeDelay: 65
-	WithChargeOverlay:
+	WithTeslaChargeOverlay:
 		Sequence: active
 		Palette: player
 		IsPlayerPalette: true