diff --git a/binaries/data/mods/public/globalscripts/Templates.js b/binaries/data/mods/public/globalscripts/Templates.js
index b6226acd0d..2a3d3e0f6a 100644
--- a/binaries/data/mods/public/globalscripts/Templates.js
+++ b/binaries/data/mods/public/globalscripts/Templates.js
@@ -214,9 +214,13 @@ function GetTemplateDataHelper(template, player, auraTemplates, modifiers = {})
 			};
 
 			ret.attack[type] = {
+				"attackName": {
+					"name": template.Attack[type].AttackName._string || template.Attack[type].AttackName,
+					"context": template.Attack[type].AttackName["@context"]
+				},
 				"minRange": getAttackStat("MinRange"),
 				"maxRange": getAttackStat("MaxRange"),
-				"elevationBonus": getAttackStat("ElevationBonus"),
+				"elevationBonus": getAttackStat("ElevationBonus")
 			};
 
 			ret.attack[type].elevationAdaptedRange = Math.sqrt(ret.attack[type].maxRange *
diff --git a/binaries/data/mods/public/gui/common/tooltips.js b/binaries/data/mods/public/gui/common/tooltips.js
index e297192f46..e4bce1f2b0 100644
--- a/binaries/data/mods/public/gui/common/tooltips.js
+++ b/binaries/data/mods/public/gui/common/tooltips.js
@@ -420,10 +420,12 @@ function getAttackTooltip(template)
 		if (attackType == "Slaughter")
 			continue;
 
-		let attackLabel = sprintf(headerFont(translate("%(attackType)s")), {
-			"attackType": attackType
-		});
 		let attackTypeTemplate = template.attack[attackType];
+		let attackLabel = sprintf(headerFont(translate("%(attackType)s")), {
+			"attackType": attackTypeTemplate.attackName.context ?
+				translateWithContext(attackTypeTemplate.attackName.context || "Name of an attack, usually the weapon.", attackTypeTemplate.attackName.name) :
+				translate(attackTypeTemplate.attackName.name)
+		});
 
 		let projectiles;
 		// Use either current rate from simulation or default count if the sim is not running.
diff --git a/binaries/data/mods/public/l10n/messages.json b/binaries/data/mods/public/l10n/messages.json
index 4319fa8cd2..85891dde75 100644
--- a/binaries/data/mods/public/l10n/messages.json
+++ b/binaries/data/mods/public/l10n/messages.json
@@ -400,6 +400,9 @@
                 ],
                 "options": {
                     "keywords": {
+                        "AttackName": {
+                            "customContext": "Name of an attack, usually the weapon."
+                        },
                         "StatusName": {
                             "customContext": "status effect"
                         },
@@ -441,6 +444,9 @@
                 ],
                 "options": {
                     "keywords": {
+                        "AttackName": {
+                            "customContext": "Name of an attack, usually the weapon."
+                        },
                         "StatusName": {
                             "customContext": "status effect"
                         },
@@ -489,6 +495,9 @@
                 },
                 "options": {
                     "keywords": {
+                        "AttackName": {
+                            "customContext": "Name of an attack, usually the weapon."
+                        },
                         "GenericName": {},
                         "SpecificName": {},
                         "History": {},
diff --git a/binaries/data/mods/public/simulation/components/Attack.js b/binaries/data/mods/public/simulation/components/Attack.js
index ebe234530d..b7683f2aa4 100644
--- a/binaries/data/mods/public/simulation/components/Attack.js
+++ b/binaries/data/mods/public/simulation/components/Attack.js
@@ -26,6 +26,7 @@ Attack.prototype.Schema =
 	"<a:help>Controls the attack abilities and strengths of the unit.</a:help>" +
 	"<a:example>" +
 		"<Melee>" +
+			"<AttackName>Spear</AttackName>" +
 			"<Damage>" +
 				"<Hack>10.0</Hack>" +
 				"<Pierce>0.0</Pierce>" +
@@ -48,6 +49,7 @@ Attack.prototype.Schema =
 			"<PreferredClasses datatype=\"tokens\">Cavalry Infantry</PreferredClasses>" +
 		"</Melee>" +
 		"<Ranged>" +
+			"<AttackName>Bow</AttackName>" +
 			"<Damage>" +
 				"<Hack>0.0</Hack>" +
 				"<Pierce>10.0</Pierce>" +
@@ -97,6 +99,14 @@ Attack.prototype.Schema =
 	"<optional>" +
 		"<element name='Melee'>" +
 			"<interleave>" +
+				"<element name='AttackName' a:help='Name of the attack, to be displayed in the GUI. Optionally includes a translate context attribute.'>" +
+					"<optional>" +
+						"<attribute name='context'>" +
+							"<text/>" +
+						"</attribute>" +
+					"</optional>" +
+					"<text/>" +
+				"</element>" +
 				Attacking.BuildAttackEffectsSchema() +
 				"<element name='MaxRange' a:help='Maximum attack range (in metres)'><ref name='nonNegativeDecimal'/></element>" +
 				"<element name='PrepareTime' a:help='Time from the start of the attack command until the attack actually occurs (in milliseconds). This value relative to RepeatTime should closely match the \"event\" point in the actor&apos;s attack animation'>" +
@@ -113,6 +123,14 @@ Attack.prototype.Schema =
 	"<optional>" +
 		"<element name='Ranged'>" +
 			"<interleave>" +
+				"<element name='AttackName' a:help='Name of the attack, to be displayed in the GUI. Optionally includes a translate context attribute.'>" +
+					"<optional>" +
+						"<attribute name='context'>" +
+							"<text/>" +
+						"</attribute>" +
+					"</optional>" +
+					"<text/>" +
+				"</element>" +
 				Attacking.BuildAttackEffectsSchema() +
 				"<element name='MaxRange' a:help='Maximum attack range (in metres)'><ref name='nonNegativeDecimal'/></element>" +
 				"<element name='MinRange' a:help='Minimum attack range (in metres)'><ref name='nonNegativeDecimal'/></element>" +
@@ -185,6 +203,14 @@ Attack.prototype.Schema =
 	"<optional>" +
 		"<element name='Capture'>" +
 			"<interleave>" +
+				"<element name='AttackName' a:help='Name of the attack, to be displayed in the GUI. Optionally includes a translate context attribute.'>" +
+					"<optional>" +
+						"<attribute name='context'>" +
+							"<text/>" +
+						"</attribute>" +
+					"</optional>" +
+					"<text/>" +
+				"</element>" +
 				Attacking.BuildAttackEffectsSchema() +
 				"<element name='MaxRange' a:help='Maximum attack range (in meters)'><ref name='nonNegativeDecimal'/></element>" +
 				"<element name='RepeatTime' a:help='Time between attacks (in milliseconds). The attack animation will be stretched to match this time'>" + // TODO: it shouldn't be stretched
@@ -198,6 +224,14 @@ Attack.prototype.Schema =
 	"<optional>" +
 		"<element name='Slaughter' a:help='A special attack to kill domestic animals'>" +
 			"<interleave>" +
+				"<element name='AttackName' a:help='Name of the attack, to be displayed in the GUI. Optionally includes a translate context attribute.'>" +
+					"<optional>" +
+						"<attribute name='context'>" +
+							"<text/>" +
+						"</attribute>" +
+					"</optional>" +
+					"<text/>" +
+				"</element>" +
 				Attacking.BuildAttackEffectsSchema() +
 				"<element name='MaxRange'><ref name='nonNegativeDecimal'/></element>" + // TODO: how do these work?
 				Attack.prototype.preferredClassesSchema +
@@ -403,6 +437,14 @@ Attack.prototype.CompareEntitiesByPreference = function(a, b)
 	return aPreference - bPreference;
 };
 
+Attack.prototype.GetAttackName = function(type)
+{
+	return {
+		"name": this.template[type].AttackName._string || this.template[type].AttackName,
+		"context": this.template[type].AttackName["@context"]
+	};
+};
+
 Attack.prototype.GetRepeatTime = function(type)
 {
 	let repeatTime = 1000;
diff --git a/binaries/data/mods/public/simulation/components/GuiInterface.js b/binaries/data/mods/public/simulation/components/GuiInterface.js
index aa1e5219f0..c02d103020 100644
--- a/binaries/data/mods/public/simulation/components/GuiInterface.js
+++ b/binaries/data/mods/public/simulation/components/GuiInterface.js
@@ -423,6 +423,8 @@ GuiInterface.prototype.GetEntityState = function(player, ent)
 
 			Object.assign(ret.attack[type], cmpAttack.GetAttackEffectsData(type));
 
+			ret.attack[type].attackName = cmpAttack.GetAttackName(type);
+
 			ret.attack[type].splash = cmpAttack.GetSplashData(type);
 			if (ret.attack[type].splash)
 				Object.assign(ret.attack[type].splash, cmpAttack.GetAttackEffectsData(type, true));
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
index 00027078d0..1a1a951134 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_boar.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
+      <AttackName>Tusks</AttackName>
       <Damage>
         <Hack>12.0</Hack>
         <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
index 21298ec5e8..acb46c49b7 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_crocodile_nile.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_wild_aggressive">
   <Attack>
     <Melee>
+      <AttackName>Teeth</AttackName>
       <Damage>
         <Hack>30.0</Hack>
         <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
index 719c3c5ca9..260c52284a 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_hippopotamus.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
+      <AttackName>Tusks</AttackName>
       <Damage>
         <Hack>12</Hack>
         <Pierce>12</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
index 0d3a3137b2..3f0b7fd69a 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_lion.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_wild_violent">
   <Attack>
     <Melee>
+      <AttackName>Paws</AttackName>
       <Damage>
         <Hack>20.0</Hack>
         <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
index faf66bf7d7..7a36c5c046 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_rhinoceros_white.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
+      <AttackName>Horn</AttackName>
       <Damage>
         <Hack>20.0</Hack>
         <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
index 8b0c180b42..b9be0ce942 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_tiger.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_wild_violent">
   <Attack>
     <Melee>
+      <AttackName>Paws</AttackName>
       <Damage>
         <Hack>30.0</Hack>
         <Pierce>20.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml b/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
index 305b394c73..82ee8b98dd 100644
--- a/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
+++ b/binaries/data/mods/public/simulation/templates/gaia/fauna_walrus.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Attack>
     <Melee>
+      <AttackName>Tusks</AttackName>
       <Damage>
         <Hack>15.0</Hack>
         <Pierce>10.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
index 608a0c2ddf..742dbb3b49 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
+++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_melee_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee">
+  <Attack>
+    <Melee>
+      <AttackName>Melee</AttackName>
+    </Melee>
+  </Attack>
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml b/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
index 512187b43c..12ffa16d32 100644
--- a/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
+++ b/binaries/data/mods/public/simulation/templates/skirmish/units/default_infantry_ranged_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_ranged">
+  <Attack>
+    <Ranged>
+      <AttackName>Ranged</AttackName>
+    </Ranged>
+  </Attack>
   <Identity>
     <Civ>skirm</Civ>
   </Identity>
diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml b/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
index 46fe2ead58..ed93eae2b8 100644
--- a/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/rome_army_camp.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_special">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>25.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
index cd82bcf4d0..5065feae35 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -8,6 +8,7 @@
   </AlertRaiser>
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>12.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
index ea037d5c31..8ca476ed6d 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_defensive">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
index dc23269b5d..1abb6bf312 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_artillery.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_defensive_tower">
   <Attack>
     <Ranged>
+      <AttackName>Stone</AttackName>
       <Damage>
         <Pierce>35</Pierce>
         <Crush>25</Crush>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
index b6fe6f2725..053662caee 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_tower_bolt.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_defensive_tower">
   <Attack>
     <Ranged>
+      <AttackName>Bolt</AttackName>
       <Damage>
         <Pierce>55</Pierce>
         <Crush>5</Crush>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml b/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
index 548d5e1b65..128b3b79a4 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_defensive_wall_tower.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_defensive_wall">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>8.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
index 59a7c8e0d4..245c267df1 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_structure_military">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>16.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
index c18e833778..192e99b5af 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry.xml
@@ -2,12 +2,14 @@
 <Entity parent="template_unit">
   <Attack>
     <Capture>
+      <AttackName>Capture</AttackName>
       <Capture>2.5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
     </Capture>
     <Slaughter>
+      <AttackName>Slaughter</AttackName>
       <Damage>
         <Hack>100.0</Hack>
         <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
index 4160dd45ee..81b71e3715 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_axeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_cavalry_melee">
   <Attack>
     <Melee>
+      <AttackName>Axe</AttackName>
       <Damage>
         <Hack>6.9</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
index 8e287f497e..ffb3a44fa0 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_spearman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_cavalry_melee">
   <Attack>
     <Melee>
+      <AttackName>Spear</AttackName>
       <Damage>
         <Hack>4</Hack>
         <Pierce>3</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
index c68f13b39e..6376a0f5a7 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_melee_swordsman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_cavalry_melee">
   <Attack>
     <Melee>
+      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>6.5</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
index b59fd6adfe..d86738f923 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_archer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_cavalry_ranged">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>7.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
index 7adcdc05fd..c9f46bb265 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_cavalry_ranged_javelineer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_cavalry_ranged">
   <Attack>
     <Ranged>
+      <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>18.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
index 06cdc89d5c..1436b3d978 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit">
   <Attack>
     <Capture>
+      <AttackName>Capture</AttackName>
       <Capture>5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
index 0e903b6f63..ed05e50e9b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_archer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>14.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
index 2ebb98c71e..bcb75770bf 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_axeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Melee>
+      <AttackName>Axe</AttackName>
       <Damage>
         <Hack>13.8</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
index dfe42feb15..8cdae7e357 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_javelineer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Ranged>
+      <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>36.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
index 2b28a54141..c71d7aec67 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_spearman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Melee>
+      <AttackName>Spear</AttackName>
       <Damage>
         <Hack>8</Hack>
         <Pierce>6</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
index 6048dcb563..bb62865c3b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_cavalry_swordsman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_cavalry">
   <Attack>
     <Melee>
+      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>13.0</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
index 175a9a7520..d97df5774d 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_elephant_melee.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_elephant">
   <Attack replace="">
     <Melee>
+      <AttackName>Trunk</AttackName>
       <Damage>
         <Hack>20</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
index 67615ff76c..538ca18f3b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_archer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>6.5</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
index 196a2393a9..2d15e8d552 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_axeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Melee>
+      <AttackName>Axe</AttackName>
       <Damage>
         <Hack>12</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml
index bea494e3c3..aa9152de5c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_javelineer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Ranged>
+      <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>26.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
index 79bfa81d45..ee39ce5f4e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_maceman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Melee>
+      <AttackName>Mace</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
index b903fe156d..9ee9ccd2db 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_pikeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Melee>
+      <AttackName>Pike</AttackName>
       <Damage>
         <Hack>2.0</Hack>
         <Pierce>6.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
index 7d0cf75484..2edaaf5390 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_spearman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Melee>
+      <AttackName>Spear</AttackName>
       <Damage>
         <Hack>6.0</Hack>
         <Pierce>5.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
index c67361bd5f..450595e127 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_champion_infantry_swordsman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry">
   <Attack>
     <Melee>
+      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>11.0</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_dog.xml b/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
index 53ebba4fdf..8ef5294158 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_dog.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit">
   <Attack>
     <Melee>
+      <AttackName>Fangs</AttackName>
       <Damage>
         <Hack>7</Hack>
         <Pierce>2</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
index 9668e0ee7a..57b298f10b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_aggressive_bear.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_hunt_aggressive">
   <Attack>
     <Melee>
+      <AttackName>Paws</AttackName>
       <Damage>
         <Hack>20</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
index a7ea5dd1b4..8e70bc85e9 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Attack>
     <Melee>
+      <AttackName>Horns</AttackName>
       <Damage>
         <Hack>1</Hack>
         <Pierce>5</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
index 3690df2150..ad6eb6800b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_elephant.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_hunt_defensive">
   <Attack>
     <Melee>
+      <AttackName>Trunk</AttackName>
       <Damage>
         <Hack>25.0</Hack>
         <Pierce>10.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
index 0c1a6becc3..0dfca1e6f3 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_dog.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_wild_aggressive_wolf">
   <Attack>
     <Melee>
+      <AttackName>Fangs</AttackName>
       <Damage>
         <Hack>7</Hack>
         <Pierce>2</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
index d5c6416597..b86983bc74 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_aggressive_wolf.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_wild_aggressive">
   <Attack>
     <Melee>
+      <AttackName>Fangs</AttackName>
       <Damage>
         <Hack>10.0</Hack>
         <Pierce>10.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
index a57f38d25d..f0eddcfd25 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna_wild_defensive_fox.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_fauna_wild_defensive">
   <Attack>
     <Melee>
+      <AttackName>Fangs</AttackName>
       <Damage>
         <Hack>2.5</Hack>
         <Pierce>5.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
index c2fb2f2b59..f9f8c29093 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit">
   <Attack>
     <Capture>
+      <AttackName>Capture</AttackName>
       <Capture>10</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
index 0dc74ef7b7..6b94dde276 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_archer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>35</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
index e7b39110f4..749b12b6f7 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_axeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Melee>
+      <AttackName>Axe</AttackName>
       <Damage>
         <Hack>27.6</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
index 0d1d610412..2c22263b21 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_javelineer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Ranged>
+      <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>60.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
index 51ac54fe10..baaa79014e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_spearman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Melee>
+      <AttackName>Spear</AttackName>
       <Damage>
         <Hack>16</Hack>
         <Pierce>12</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
index a523b5a262..2cb4668ce1 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_cavalry_swordsman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_cavalry">
   <Attack>
     <Melee>
+      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>26.0</Hack>
         <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
index 1c78f670e1..4fdf304aec 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_elephant_melee.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero">
   <Attack replace="">
     <Melee>
+      <AttackName>Trunk</AttackName>
       <Damage>
         <Hack>20.0</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
index 99f44e9c9b..70563db19e 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_archer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>8.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
index b831f31d5f..f67bb3d63b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_axeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Melee>
+      <AttackName>Axe</AttackName>
       <Damage>
         <Hack>24</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
index 278200f6f8..be8ad4ff8c 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_javelineer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Ranged>
+      <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>50.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
index 96becd3684..7d338a77dd 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_pikeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Melee>
+      <AttackName>Pike</AttackName>
       <Damage>
         <Hack>4.0</Hack>
         <Pierce>20.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
index aada4ef12f..7d985e8204 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_spearman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Melee>
+      <AttackName>Spear</AttackName>
       <Damage>
         <Hack>12.0</Hack>
         <Pierce>10.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
index d9aed7e204..bb6b6fca33 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero_infantry_swordsman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_infantry">
   <Attack>
     <Melee>
+      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>22.0</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
index 1b4879b197..b5da879b0b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry.xml
@@ -2,12 +2,14 @@
 <Entity parent="template_unit">
   <Attack>
     <Capture>
+      <AttackName>Capture</AttackName>
       <Capture>2.5</Capture>
       <MaxRange>4</MaxRange>
       <RepeatTime>1000</RepeatTime>
       <RestrictedClasses datatype="tokens">Field Palisade Wall</RestrictedClasses>
     </Capture>
     <Slaughter>
+      <AttackName>Slaughter</AttackName>
       <Damage>
         <Hack>50.0</Hack>
         <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
index f42c28b1cc..59ffb8ea2b 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_axeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_melee">
   <Attack>
     <Melee>
+      <AttackName>Axe</AttackName>
       <Damage>
         <Hack>6</Hack>
         <Crush>2</Crush>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
index 8b2861a0fd..d61ba28713 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_pikeman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_melee">
   <Attack>
     <Melee>
+      <AttackName>Pike</AttackName>
       <Damage>
         <Hack>1</Hack>
         <Pierce>3</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
index 09121f6f3f..f1a963d22f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_spearman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_melee">
   <Attack>
     <Melee>
+      <AttackName>Spear</AttackName>
       <Damage>
         <Hack>3.0</Hack>
         <Pierce>2.5</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
index 26a7d9552a..8b6b2141c8 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_melee_swordsman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_melee">
   <Attack>
     <Melee>
+      <AttackName context="Name of an attack using a double-edged sword.">Sword</AttackName>
       <Damage>
         <Hack>5.5</Hack>
         <Pierce>0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
index aca4a73af8..252aa17296 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_archer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_ranged">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>6.7</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml
index a5f5571ad9..7ade5e393a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_javelineer.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_ranged">
   <Attack>
     <Ranged>
+      <AttackName>Javelin</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>16.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
index 1449de6e35..83a19b0f48 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_infantry_ranged_slinger.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_ranged">
   <Attack>
     <Ranged>
+      <AttackName>Sling</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>9.2</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
index 82c99c5236..48f8be17f2 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_bireme.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>35.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
index b3c907c1d4..cb74ce2d95 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_fire.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Melee>
+      <AttackName>Fire</AttackName>
       <Damage>
         <Hack>10.0</Hack>
         <Pierce>10.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
index 887fba7d20..1eccf63034 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_fishing.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Melee>
+      <AttackName>Harpoon</AttackName>
       <Damage>
         <Hack>10.0</Hack>
         <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
index 69751f186d..85d8201477 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_quinquereme.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
+      <AttackName>Stone</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>10.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml b/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
index 8b72e887d5..253844035a 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_ship_trireme.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_ship">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>35.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml b/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
index c40c889591..b986f0240f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_siege_boltshooter.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
+      <AttackName>Bolt</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>150.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml b/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
index abf1b5ac40..797fd801b6 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_siege_ram.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Melee>
+      <AttackName>Ram</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml b/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
index 22969876c1..7ceada6313 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_siege_stonethrower.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
+      <AttackName>Stone</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>10.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml b/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
index 3ab5ca9e69..fac2e346fb 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_siege_tower.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
+      <AttackName>Bow</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>12.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
index ba781b8b92..d30fc4f1a5 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support_female_citizen.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_support">
   <Attack>
     <Melee>
+      <AttackName>Dagger</AttackName>
       <Damage>
         <Hack>2.0</Hack>
         <Pierce>0</Pierce>
@@ -12,6 +13,7 @@
       <RepeatTime>1000</RepeatTime>
     </Melee>
     <Slaughter>
+      <AttackName>Slaughter</AttackName>
       <Damage>
         <Hack>25.0</Hack>
         <Pierce>0.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
index eb1a1008f5..318e2e3c82 100644
--- a/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/athen_cavalry_swordsman_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Identity>
     <Civ>athen</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
index f6643b9678..7d26836072 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_cavalry_swordsman_iber_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_cavalry_melee_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Cost>
     <Resources>
       <food op="add">-25</food>
diff --git a/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml b/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
index 7be8bdd692..c724e40ce3 100644
--- a/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
+++ b/binaries/data/mods/public/simulation/templates/units/cart_hero_hamilcar.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_cavalry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Auras datatype="tokens">
     units/heroes/cart_hero_hamilcar_1
     units/heroes/cart_hero_hamilcar_2
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml b/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml
index 332a407d63..1fcb4359aa 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_champion_infantry.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Identity>
     <Civ>iber</Civ>
     <SpecificName>Leial Ezpatari</SpecificName>
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_infantry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/iber_infantry_swordsman_b.xml
index 0fd59fae5f..1eb329d20f 100644
--- a/binaries/data/mods/public/simulation/templates/units/iber_infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/iber_infantry_swordsman_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Builder>
     <Entities datatype="tokens">
       structures/iber_monument
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml b/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml
index c578591150..96181fc558 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_champion_infantry_amun.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Identity>
     <Civ>kush</Civ>
     <Lang>napatan</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_b.xml
index d146bbe3c5..887c2fe1b0 100644
--- a/binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/kush_infantry_maceman_merc_b.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_infantry_melee_swordsman">
   <Attack>
     <Melee>
+      <AttackName>Mace</AttackName>
       <Damage>
         <Hack>3.0</Hack>
         <Crush>2.5</Crush>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml
index 1fb38213df..de77ef5971 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_crossbowman.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_champion_infantry_archer">
   <Attack>
     <Ranged>
+      <AttackName>Crossbow</AttackName>
       <Damage>
         <Hack>0</Hack>
         <Pierce>6.5</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_swordsman.xml b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_swordsman.xml
index 3f36b587b8..d043621b24 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_swordsman.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_champion_infantry_swordsman.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a rhomphaia (ῥομφαία), a Thracian two-handed weapon capable of both thrusting and slashing.">Rhomphaia</AttackName>
+    </Melee>
+  </Attack>
   <Identity>
     <Civ>mace</Civ>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
index 86e6ae8d08..45e83df91d 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_alexander.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_hero_cavalry_swordsman">
   <Attack>
     <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
       <Bonuses>
         <Herocide>
           <Classes>Hero</Classes>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
index 533768375e..35e4d0ecf8 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_craterus.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Auras datatype="tokens">
     units/heroes/mace_hero_craterus
   </Auras>
diff --git a/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml b/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
index 0c481bac1a..dedd711150 100644
--- a/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
+++ b/binaries/data/mods/public/simulation/templates/units/mace_hero_demetrius.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_hero_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Auras datatype="tokens">
     units/heroes/mace_hero_demetrius
   </Auras>
diff --git a/binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml b/binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml
index 0d57efe7d1..0352a60da6 100644
--- a/binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/maur_infantry_swordsman_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
+    </Melee>
+  </Attack>
   <Builder>
     <Entities datatype="tokens">
       structures/maur_elephant_stables
diff --git a/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml b/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
index fdb69c7381..9c93d4e6c0 100644
--- a/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
+++ b/binaries/data/mods/public/simulation/templates/units/merc_black_cloak.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_champion_infantry_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a rhomphaia (ῥομφαία), a Thracian two-handed weapon capable of both thrusting and slashing.">Rhomphaia</AttackName>
+    </Melee>
+  </Attack>
   <Identity>
     <VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
     <Lang>greek</Lang>
diff --git a/binaries/data/mods/public/simulation/templates/units/plane.xml b/binaries/data/mods/public/simulation/templates/units/plane.xml
index fe7b75cc0a..3349abed92 100644
--- a/binaries/data/mods/public/simulation/templates/units/plane.xml
+++ b/binaries/data/mods/public/simulation/templates/units/plane.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit">
   <Attack>
     <Ranged>
+      <AttackName>Machine Guns</AttackName>
       <Damage>
         <Hack>0.0</Hack>
         <Pierce>100.0</Pierce>
diff --git a/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml b/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
index 3ae9ed9816..fafa96797e 100644
--- a/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
+++ b/binaries/data/mods/public/simulation/templates/units/sele_infantry_swordsman_merc_b.xml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_unit_infantry_melee_swordsman">
+  <Attack>
+    <Melee>
+      <AttackName context="Name of an attack using a rhomphaia (ῥομφαία), a Thracian two-handed weapon capable of both thrusting and slashing.">Rhomphaia</AttackName>
+    </Melee>
+  </Attack>
   <Builder>
     <Entities datatype="tokens">
       structures/sele_library
diff --git a/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml b/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
index 73bcc4e082..ad94fbf649 100644
--- a/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
+++ b/binaries/data/mods/public/simulation/templates/units/theb_siege_fireraiser.xml
@@ -2,6 +2,7 @@
 <Entity parent="template_unit_siege">
   <Attack>
     <Ranged>
+      <AttackName>Fire</AttackName>
       <Damage>
         <Hack>50.0</Hack>
         <Pierce>0.0</Pierce>