diff --git a/AGE System/AGE System.html b/AGE System/AGE System.html
index 4fcb5ac084..188b929782 100644
--- a/AGE System/AGE System.html	
+++ b/AGE System/AGE System.html	
@@ -559,12 +559,12 @@
 						</div>
 						<div class="col repeatingcol col-attackdice">
 							<input type="text" placeholder="1" name="attr_attackroll">
-							<button type="roll" class="attackroll-noaim" value="@{wtype}&{template:default} {{name=@{character_name} | @{attack-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Bonus=[[@{attackroll}]]}}{{Range=@{range}}}{{Reload=@{reload}}}" name="roll_attackdice"></button>
-							<button type="roll" class="attackroll-withaim" value="@{wtype}&{template:default} {{name=@{character_name} | @{attack-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Bonus=[[@{attackroll}]]}}{{Aim=[[?{Using the Aim action|Yes, @{aim-value}|No, 0}]]}}{{Range=@{range}}}{{Reload=@{reload}}}" name="roll_attackdice"></button>
+							<button type="roll" class="attackroll-noaim" value="@{wtype}&{template:default} {{name=@{char-name-option}@{attack-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Bonus=[[@{attackroll}]]}}{{Range=@{range}}}{{Reload=@{reload}}}" name="roll_attackdice"></button>
+							<button type="roll" class="attackroll-withaim" value="@{wtype}&{template:default} {{name=@{char-name-option}@{attack-name}}}{{Roll=[[1d6cs>7cf<0]] [[1d6cs>7cf<0]] [[1d6cs>1cf<6]]}}{{Bonus=[[@{attackroll}]]}}{{Aim=[[?{Using the Aim action|Yes, @{aim-value}|No, 0}]]}}{{Range=@{range}}}{{Reload=@{reload}}}" name="roll_attackdice"></button>
 						</div>
 						<div class="col repeatingcol col-attack-damage">
 							<input type="text" placeholder="2d6+1" name="attr_attack-damage">
-							<button type="roll" value="@{wtype}&{template:default} {{name=@{character_name} | @{attack-name}}}{{Damage=[[@{attack-damage}]]}}" name="roll_weapondamage"></button>
+							<button type="roll" value="@{wtype}&{template:default} {{name=@{char-name-option}@{attack-name}}}{{Damage=[[@{attack-damage}]]}}" name="roll_weapondamage"></button>
 						</div>
 					</fieldset>
 					<div class="col-weapon-groups">