Fix approximately 35 broken image references.

Move a number of old image files to slightly different names,
following the recent convention of separating frame numbers with a
dash.

(Found by macroscope.)

data/campaigns/Heir_To_The_Throne/scenarios/05b_Isle_of_the_Damned.cfg

@@ -496,7 +496,7 @@
 		{RESTORE_RECALL_LIST}
 		[message]
 		speaker=narrator
-		image=elvish-fighter.png
+		image=units/elves-wood/fighter.png
 		message= _ "Thank goodness we have found you, sir! Come aboard quickly, we shall take you away from this horrible island!"
 		[/message]
 		[message]

data/campaigns/Heir_To_The_Throne/units/Commander.cfg

@@ -235,6 +235,6 @@
 			[/animation]
 		[/attack]
 		{DEFENSE_ANIM_RANGE "konrad-commander-defend.png" "konrad-commander.png" {SOUND_LIST:HUMAN_HIT} melee}
-		{DEFENSE_ANIM_RANGE "konrad-commander-ranged-defend.png" "konrad-commander.png" {SOUND_LIST:HUMAN_HIT} ranged}
+		{DEFENSE_ANIM_RANGE "konrad-commander-bow-defend.png" "konrad-commander.png" {SOUND_LIST:HUMAN_HIT} ranged}
 	[/variation]
 [/unit]

data/campaigns/The_South_Guard/scenarios/2.Proven_By_The_Sword.cfg

@@ -475,7 +475,7 @@
 	#ifdef EASY
 		[message]
 			speaker=narrator
-			image="human-magi/white-mage-magic1.png~TC(1,magenta)"
+			image="human-magi/white-mage-magic-1.png~TC(1,magenta)"
 			message= _ "Not only will Minister Hylas's Holy attack melt undead bones, but he can also heal wounded units near him."
 		[/message]
 	#endif

data/campaigns/Under_the_Burning_Suns/scenarios/2_Harsh_Sands.cfg

@@ -3012,7 +3012,7 @@ side=1
     [object]
         id=PureWater
         name= _ "Pure Water"
-        image=misc/item-holywater.png
+        image=items/holy-water.png
         description= _ "This water will make your melee weapons holy, and thus especially powerful against the undead."
 
         [effect]

data/campaigns/Under_the_Burning_Suns/scenarios/6_1_Hunting_Trolls.cfg

@@ -926,7 +926,7 @@ name=moveto
 [redraw]
 [/redraw]
 
-{PLACE_IMAGE troll-grunt-attack.png 34 5}
+{PLACE_IMAGE units/trolls/grunt-attack-1.png 34 5}
 
 [redraw]
 [/redraw]

data/campaigns/Under_the_Burning_Suns/units/Desert_Sharpshooter.cfg

@@ -36,22 +36,22 @@ Special Notes: Their marksmanship gives these elves a high chance of hitting the
 		[frame]
 			begin=0
 			end=100
-			image="newleves/desert-elvish-sharpshooter-die1.png"
+			image="newelves/desert-elvish-sharpshooter-die1.png"
 		[/frame]
 		[frame]
 			begin=100
 			end=200
-			image="newleves/desert-elvish-sharpshooter-die2.png"
+			image="newelves/desert-elvish-sharpshooter-die2.png"
 		[/frame]
 		[frame]
 			begin=200
 			end=300
-			image="newleves/desert-elvish-sharpshooter-die3.png"
+			image="newelves/desert-elvish-sharpshooter-die3.png"
 		[/frame]
 		[frame]
 			begin=300
 			end=400
-			image="newleves/desert-elvish-sharpshooter-die4.png"
+			image="newelves/desert-elvish-sharpshooter-die4.png"
 		[/frame]
 	[/death]
 # Because of the elvish sharpshooter's skill, I make an exception
@@ -198,22 +198,22 @@ Special Notes: Their marksmanship gives these elves a high chance of hitting the
 			[frame]
 				begin=0
 				end=100
-				image="newleves/desert-elvish-sharpshooter-die1.png"
+				image="newelves/desert-elvish-sharpshooter-die1.png"
 			[/frame]
 			[frame]
 				begin=100
 				end=200
-				image="newleves/desert-elvish-sharpshooter-die2.png"
+				image="newelves/desert-elvish-sharpshooter-die2.png"
 			[/frame]
 			[frame]
 				begin=200
 				end=300
-				image="newleves/desert-elvish-sharpshooter-die3.png"
+				image="newelves/desert-elvish-sharpshooter-die3.png"
 			[/frame]
 			[frame]
 				begin=300
 				end=400
-				image="newleves/desert-elvish-sharpshooter-die4.png"
+				image="newelves/desert-elvish-sharpshooter-die4.png"
 			[/frame]
 		[/death]
 # Because of the elvish sharpshooter's skill, I make an exception

data/campaigns/Under_the_Burning_Suns/units/Elyssa_Arch_Mage.cfg

@@ -50,14 +50,14 @@ Special Notes: the arch mage's fireballs are magical, and always have a high cha
 			[frame]
 				begin=-175
 				end=-60
-				image="units/human-magi/arch-mage+female-staff-1.png"
+				image="units/human-magi/arch-mage+female-attack-staff-1.png"
 			[/frame]
 			[if]
 				hits=yes
 				[frame]
 					begin=-60
 					end=-50
-					image="units/human-magi/arch-mage+female-staff-1.png"
+					image="units/human-magi/arch-mage+female-attack-staff-1.png"
 					sound=staff.wav
 				[/frame]
 			[/if]
@@ -66,14 +66,14 @@ Special Notes: the arch mage's fireballs are magical, and always have a high cha
 				[frame]
 					begin=-60
 					end=-50
-					image="units/human-magi/arch-mage+female-staff-1.png"
+					image="units/human-magi/arch-mage+female-attack-staff-1.png"
 					sound={SOUND_LIST:MISS}
 				[/frame]
 			[/else]
 			[frame]
 				begin=-50
 				end=50
-				image="units/human-magi/arch-mage+female-staff-2.png"
+				image="units/human-magi/arch-mage+female-attack-staff-2.png"
 			[/frame]
 		[/animation]
 	[/attack]
@@ -94,17 +94,17 @@ Special Notes: the arch mage's fireballs are magical, and always have a high cha
 			[frame]
 				begin=-240
 				end=-200
-				image="units/human-magi/arch-mage+female-fireball-1.png"
+				image="units/human-magi/arch-mage+female-attack-magic-1.png"
 			[/frame]
 			[frame]
 				begin=-200
 				end=-180
-				image="units/human-magi/arch-mage+female-fireball-1.png"
+				image="units/human-magi/arch-mage+female-attack-magic-1.png"
 			[/frame]
 			[frame]
 				begin=-180
 				end=-120
-				image="units/human-magi/arch-mage+female-fireball-2.png"
+				image="units/human-magi/arch-mage+female-attack-magic-2.png"
 				#halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
 				#halo_x,halo_y=-11,3
 				sound=fire.wav
@@ -112,21 +112,21 @@ Special Notes: the arch mage's fireballs are magical, and always have a high cha
 			[frame]
 				begin=-120
 				end=-60
-				image="units/human-magi/arch-mage+female-fireball-3.png"
+				image="units/human-magi/arch-mage+female-attack-magic-3.png"
 				#halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
 				#halo_x,halo_y=-15,1
 			[/frame]
 			[frame]
 				begin=-60
 				end=0
-				image="units/human-magi/arch-mage+female-fireball-2.png"
+				image="units/human-magi/arch-mage+female-attack-magic-2.png"
 				#halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
 				#halo_x,halo_y=-11,3
 			[/frame]
 			[frame]
 				begin=0
 				end=60
-				image="units/human-magi/arch-mage+female-fireball-1.png"
+				image="units/human-magi/arch-mage+female-attack-magic-1.png"
 			[/frame]
 		[/animation]
 	[/attack]

data/campaigns/Under_the_Burning_Suns/units/Elyssa_Great_Mage.cfg

@@ -39,14 +39,14 @@ Special Notes: the great mage's fireballs are magical, and always have a high ch
 			[frame]
 				begin=-175
 				end=-60
-				image="units/human-magi/great-mage+female-staff-1.png"
+				image="units/human-magi/great-mage+female-attack-staff-1.png"
 			[/frame]
 			[if]
 				hits=yes
 				[frame]
 					begin=-60
 					end=-50
-					image="units/human-magi/great-mage+female-staff-1.png"
+					image="units/human-magi/great-mage+female-attack-staff-1.png"
 					sound=staff.wav
 				[/frame]
 			[/if]
@@ -55,14 +55,14 @@ Special Notes: the great mage's fireballs are magical, and always have a high ch
 				[frame]
 					begin=-60
 					end=-50
-					image="units/human-magi/great-mage+female-staff-1.png"
+					image="units/human-magi/great-mage+female-attack-staff-1.png"
 					sound={SOUND_LIST:MISS}
 				[/frame]
 			[/else]
 			[frame]
 				begin=-50
 				end=50
-				image="units/human-magi/great-mage+female-staff-2.png"
+				image="units/human-magi/great-mage+female-attack-staff-2.png"
 			[/frame]
 		[/animation]
 	[/attack]
@@ -83,17 +83,17 @@ Special Notes: the great mage's fireballs are magical, and always have a high ch
 			[frame]
 				begin=-240
 				end=-200
-				image="units/human-magi/great-mage+female-fireball-1.png"
+				image="units/human-magi/great-mage+female-attack-magic-1.png"
 			[/frame]
 			[frame]
 				begin=-200
 				end=-180
-				image="units/human-magi/great-mage+female-fireball-1.png"
+				image="units/human-magi/great-mage+female-attack-magic-1.png"
 			[/frame]
 			[frame]
 				begin=-180
 				end=-120
-				image="units/human-magi/great-mage+female-fireball-2.png"
+				image="units/human-magi/great-mage+female-attack-magic-2.png"
 				#halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
 				#halo_x,halo_y=-11,3
 				sound=fire.wav
@@ -101,21 +101,21 @@ Special Notes: the great mage's fireballs are magical, and always have a high ch
 			[frame]
 				begin=-120
 				end=-60
-				image="units/human-magi/great-mage+female-fireball-3.png"
+				image="units/human-magi/great-mage+female-attack-magic-3.png"
 				#halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
 				#halo_x,halo_y=-15,1
 			[/frame]
 			[frame]
 				begin=-60
 				end=0
-				image="units/human-magi/great-mage+female-fireball-2.png"
+				image="units/human-magi/great-mage+female-attack-magic-2.png"
 				#halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
 				#halo_x,halo_y=-11,3
 			[/frame]
 			[frame]
 				begin=0
 				end=60
-				image="units/human-magi/great-mage+female-fireball-1.png"
+				image="units/human-magi/great-mage+female-attack-magic-1.png"
 			[/frame]
 		[/animation]
 	[/attack]

data/campaigns/Under_the_Burning_Suns/units/Elyssa_Red_Mage.cfg

@@ -60,13 +60,13 @@ Special Notes: the red mage's fireballs are magical, and always have a high chan
 			[frame]
 				begin=-100
 				end=-20
-				image="units/human-magi/red-mage+female-attack-staff1.png"
+				image="units/human-magi/red-mage+female-attack-staff-1.png"
 				sound=dagger-swish.wav
 			[/frame]
 			[frame]
 				begin=-20
 				end=100
-				image="units/human-magi/red-mage+female-attack-staff2.png"
+				image="units/human-magi/red-mage+female-attack-staff-2.png"
 			[/frame]
 		[/animation]
 	[/attack]
@@ -87,17 +87,17 @@ Special Notes: the red mage's fireballs are magical, and always have a high chan
 			[frame]
 				begin=-240
 				end=-200
-				image="units/human-magi/red-mage+female-fireball-1.png"
+				image="units/human-magi/red-mage+female-attack-magic-1.png"
 			[/frame]
 			[frame]
 				begin=-200
 				end=-180
-				image="units/human-magi/red-mage+female-fireball-1.png"
+				image="units/human-magi/red-mage+female-attack-magic-1.png"
 			[/frame]
 			[frame]
 				begin=-180
 				end=-120
-				image="units/human-magi/red-mage+female-fireball-2.png"
+				image="units/human-magi/red-mage+female-attack-magic-2.png"
 				#halo=halo/fireball-preparation-1.png,halo/fireball-preparation-2.png
 				#halo_x,halo_y=-11,3
 				sound=fire.wav
@@ -105,21 +105,21 @@ Special Notes: the red mage's fireballs are magical, and always have a high chan
 			[frame]
 				begin=-120
 				end=-60
-				image="units/human-magi/red-mage+female-fireball-3.png"
+				image="units/human-magi/red-mage+female-attack-magic-3.png"
 				#halo=halo/fireball-preparation-3.png,halo/fireball-preparation-4.png
 				#halo_x,halo_y=-15,1
 			[/frame]
 			[frame]
 				begin=-60
 				end=0
-				image="units/human-magi/red-mage+female-fireball-2.png"
+				image="units/human-magi/red-mage+female-attack-magic-2.png"
 				#halo=halo/fireball-preparation-5.png,halo/fireball-preparation-6.png
 				#halo_x,halo_y=-11,3
 			[/frame]
 			[frame]
 				begin=0
 				end=60
-				image="units/human-magi/red-mage+female-fireball-1.png"
+				image="units/human-magi/red-mage+female-attack-magic-1.png"
 			[/frame]
 		[/animation]
 	[/attack]

data/units/Dwarvish_Runemaster.cfg

@@ -42,7 +42,7 @@
 				[frame]
 					begin=-100
 					end=100
-					image=dwarf-runemaster-attack3.png
+					image=units/dwarves/runemaster-attack3.png
 					sound=mace.wav
 				[/frame]
 			[/if]
@@ -51,7 +51,7 @@
 				[frame]
 					begin=-100
 					end=100
-					image=dwarf-runemaster-attack3.png
+					image=units/dwarves/runemaster-attack3.png
 					sound={SOUND_LIST:MISS}
 				[/frame]
 			[/else]

data/units/Elvish_Sharpshooter.cfg

@@ -153,7 +153,7 @@ Special Notes:"+{SPECIAL_NOTES_MARKSMAN}
 		gender=female
 		image="units/elves-wood/sharpshooter+female.png"
 		die_sound={SOUND_LIST:ELF_FEMALE_HIT}
-		{DEFENSE_ANIM_RANGE "units/elves-wood/sharpshooter+female-sword-defend.png" "units/elves-wood/sharpshooter+female-sword.png" {SOUND_LIST:ELF_FEMALE_HIT} melee}
+		{DEFENSE_ANIM_RANGE "units/elves-wood/sharpshooter+female-defend.png" "units/elves-wood/sharpshooter+female-sword.png" {SOUND_LIST:ELF_FEMALE_HIT} melee}
 		{DEFENSE_ANIM_RANGE "units/elves-wood/sharpshooter+female-bow-defend.png" "units/elves-wood/sharpshooter+female-bow.png" {SOUND_LIST:ELF_FEMALE_HIT} ranged}
 #		[death]
 #			[frame]

data/units/Human_Mage_Arch.cfg

@@ -40,14 +40,14 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 			[frame]
 				begin=-200
 				end=-100
-				image="units/human-magi/arch-mage-attack-staff1.png"
+				image="units/human-magi/arch-mage-attack-staff-1.png"
 			[/frame]
 			[if]
 				hits=yes
 				[frame]
 					begin=-100
 					end=100
-					image="units/human-magi/arch-mage-attack-staff2.png"
+					image="units/human-magi/arch-mage-attack-staff-2.png"
 					sound=staff.wav
 				[/frame]
 			[/if]
@@ -56,14 +56,14 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 				[frame]
 					begin=-100
 					end=100
-					image="units/human-magi/arch-mage-attack-staff2.png"
+					image="units/human-magi/arch-mage-attack-staff-2.png"
 					sound={SOUND_LIST:MISS}
 				[/frame]
 			[/else]
 			[frame]
 				begin=100
 				end=175
-				image="units/human-magi/arch-mage-attack-magic1.png"
+				image="units/human-magi/arch-mage-attack-magic-1.png"
 			[/frame]
 			[frame]
 				begin=175
@@ -92,18 +92,18 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 			[frame]
 				begin=-175
 				end=-75
-				image="units/human-magi/arch-mage-attack-magic1.png"
+				image="units/human-magi/arch-mage-attack-magic-1.png"
 				sound=fire.wav
 			[/frame]
 			[frame]
 				begin=-75
 				end=75
-				image="units/human-magi/arch-mage-attack-magic2.png"
+				image="units/human-magi/arch-mage-attack-magic-2.png"
 			[/frame]
 			[frame]
 				begin=75
 				end=150
-				image="units/human-magi/arch-mage-attack-magic1.png"
+				image="units/human-magi/arch-mage-attack-magic-1.png"
 			[/frame]
 			[frame]
 				begin=150
@@ -124,20 +124,20 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 					image="units/human-magi/arch-mage+female.png"
 				[/frame]
 				[frame]
-					image="units/human-magi/arch-mage+female-attack-staff1.png"
+					image="units/human-magi/arch-mage+female-attack-staff-1.png"
 				[/frame]
 				[if]
 					[frame]
-						image="units/human-magi/arch-mage+female-attack-staff2.png"
+						image="units/human-magi/arch-mage+female-attack-staff-2.png"
 					[/frame]
 				[/if]
 				[else]
 					[frame]
-						image="units/human-magi/arch-mage+female-attack-staff2.png"
+						image="units/human-magi/arch-mage+female-attack-staff-2.png"
 					[/frame]
 				[/else]
 				[frame]
-					image="units/human-magi/arch-mage+female-attack-magic1.png"
+					image="units/human-magi/arch-mage+female-attack-magic-1.png"
 				[/frame]
 				[frame]
 					image="units/human-magi/arch-mage+female.png"
@@ -150,13 +150,13 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 					image="units/human-magi/arch-mage+female.png"
 				[/frame]
 				[frame]
-					image="units/human-magi/arch-mage+female-attack-magic1.png"
+					image="units/human-magi/arch-mage+female-attack-magic-1.png"
 				[/frame]
 				[frame]
-					image="units/human-magi/arch-mage+female-attack-magic2.png"
+					image="units/human-magi/arch-mage+female-attack-magic-2.png"
 				[/frame]
 				[frame]
-					image="units/human-magi/arch-mage+female-attack-magic1.png"
+					image="units/human-magi/arch-mage+female-attack-magic-1.png"
 				[/frame]
 				[frame]
 					image="units/human-magi/arch-mage+female.png"

data/units/Human_Mage_Great.cfg

@@ -41,14 +41,14 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 			[frame]
 				begin=-200
 				end=-100
-				image="units/human-magi/great-mage-attack-staff1.png"
+				image="units/human-magi/great-mage-attack-staff-1.png"
 			[/frame]
 			[if]
 				hits=yes
 				[frame]
 					begin=-100
 					end=100
-					image="units/human-magi/great-mage-attack-staff2.png"
+					image="units/human-magi/great-mage-attack-staff-2.png"
 					sound=staff.wav
 				[/frame]
 			[/if]
@@ -57,14 +57,14 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 				[frame]
 					begin=-100
 					end=100
-					image="units/human-magi/great-mage-attack-staff2.png"
+					image="units/human-magi/great-mage-attack-staff-2.png"
 					sound={SOUND_LIST:MISS}
 				[/frame]
 			[/else]
 			[frame]
 				begin=100
 				end=175
-				image="units/human-magi/great-mage-attack-magic1.png"
+				image="units/human-magi/great-mage-attack-magic-1.png"
 			[/frame]
 			[frame]
 				begin=175
@@ -93,18 +93,18 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 			[frame]
 				begin=-175
 				end=-75
-				image="units/human-magi/great-mage-attack-magic1.png"
+				image="units/human-magi/great-mage-attack-magic-1.png"
 				sound=fire.wav
 			[/frame]
 			[frame]
 				begin=-75
 				end=75
-				image="units/human-magi/great-mage-attack-magic2.png"
+				image="units/human-magi/great-mage-attack-magic-2.png"
 			[/frame]
 			[frame]
 				begin=75
 				end=150
-				image="units/human-magi/great-mage-attack-magic1.png"
+				image="units/human-magi/great-mage-attack-magic-1.png"
 			[/frame]
 			[frame]
 				begin=150
@@ -125,20 +125,20 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 					image="units/human-magi/great-mage+female.png"
 				[/frame]
 				[frame]
-					image="units/human-magi/great-mage+female-attack-staff1.png"
+					image="units/human-magi/great-mage+female-attack-staff-1.png"
 				[/frame]
 				[if]
 					[frame]
-						image="units/human-magi/great-mage+female-attack-staff2.png"
+						image="units/human-magi/great-mage+female-attack-staff-2.png"
 					[/frame]
 				[/if]
 				[else]
 					[frame]
-						image="units/human-magi/great-mage+female-attack-staff2.png"
+						image="units/human-magi/great-mage+female-attack-staff-2.png"
 					[/frame]
 				[/else]
 				[frame]
-					image="units/human-magi/great-mage+female-attack-magic1.png"
+					image="units/human-magi/great-mage+female-attack-magic-1.png"
 				[/frame]
 				[frame]
 					image="units/human-magi/great-mage+female.png"
@@ -151,13 +151,13 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 					image="units/human-magi/great-mage+female.png"
 				[/frame]
 				[frame]
-					image="units/human-magi/great-mage+female-attack-magic1.png"
+					image="units/human-magi/great-mage+female-attack-magic-1.png"
 				[/frame]
 				[frame]
-					image="units/human-magi/great-mage+female-attack-magic2.png"
+					image="units/human-magi/great-mage+female-attack-magic-2.png"
 				[/frame]
 				[frame]
-					image="units/human-magi/great-mage+female-attack-magic1.png"
+					image="units/human-magi/great-mage+female-attack-magic-1.png"
 				[/frame]
 				[frame]
 					image="units/human-magi/great-mage+female.png"

data/units/Human_Mage_Red.cfg

@@ -62,14 +62,14 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 			[frame]
 				begin=-200
 				end=-100
-				image="units/human-magi/red-mage-attack-staff1.png"
+				image="units/human-magi/red-mage-attack-staff-1.png"
 			[/frame]
 			[if]
 				hits=yes
 				[frame]
 					begin=-100
 					end=100
-					image="units/human-magi/red-mage-attack-staff2.png"
+					image="units/human-magi/red-mage-attack-staff-2.png"
 					sound=staff.wav
 				[/frame]
 			[/if]
@@ -78,14 +78,14 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 				[frame]
 					begin=-100
 					end=100
-					image="units/human-magi/red-mage-attack-staff2.png"
+					image="units/human-magi/red-mage-attack-staff-2.png"
 					sound={SOUND_LIST:MISS}
 				[/frame]
 			[/else]
 			[frame]
 				begin=100
 				end=175
-				image="units/human-magi/red-mage-attack-magic1.png"
+				image="units/human-magi/red-mage-attack-magic-1.png"
 			[/frame]
 			[frame]
 				begin=175
@@ -114,13 +114,13 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 			[frame]
 				begin=-175
 				end=-75
-				image="units/human-magi/red-mage-attack-magic1.png"
+				image="units/human-magi/red-mage-attack-magic-1.png"
 				sound=fire.wav
 			[/frame]
 			[frame]
 				begin=-75
 				end=75
-				image="units/human-magi/red-mage-attack-magic2.png"
+				image="units/human-magi/red-mage-attack-magic-2.png"
 			[/frame]
 			[frame]
 				begin=75
@@ -160,20 +160,20 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 					image="units/human-magi/red-mage+female.png"
 				[/frame]
 				[frame]
-					image="units/human-magi/red-mage+female-attack-staff1.png"
+					image="units/human-magi/red-mage+female-attack-staff-1.png"
 				[/frame]
 				[if]
 					[frame]
-						image="units/human-magi/red-mage+female-attack-staff2.png"
+						image="units/human-magi/red-mage+female-attack-staff-2.png"
 					[/frame]
 				[/if]
 				[else]
 					[frame]
-						image="units/human-magi/red-mage+female-attack-staff2.png"
+						image="units/human-magi/red-mage+female-attack-staff-2.png"
 					[/frame]
 				[/else]
 				[frame]
-					image="units/human-magi/red-mage+female-attack-magic1.png"
+					image="units/human-magi/red-mage+female-attack-magic-1.png"
 				[/frame]
 				[frame]
 					image="units/human-magi/red-mage+female.png"
@@ -186,13 +186,13 @@ Special Notes:"+{SPECIAL_NOTES_MAGICAL}
 					image="units/human-magi/red-mage+female.png"
 				[/frame]
 				[frame]
-					image="units/human-magi/red-mage+female-attack-magic1.png"
+					image="units/human-magi/red-mage+female-attack-magic-1.png"
 				[/frame]
 				[frame]
-					image="units/human-magi/red-mage+female-attack-magic2.png"
+					image="units/human-magi/red-mage+female-attack-magic-2.png"
 				[/frame]
 				[frame]
-					image="units/human-magi/red-mage+female-attack-magic1.png"
+					image="units/human-magi/red-mage+female-attack-magic-1.png"
 				[/frame]
 				[frame]
 					image="units/human-magi/red-mage+female.png"