diff --git a/mods/ts/audio/voices.yaml b/mods/ts/audio/voices.yaml
index 1971435522..2cda082ea7 100644
--- a/mods/ts/audio/voices.yaml
+++ b/mods/ts/audio/voices.yaml
@@ -1,201 +1,201 @@
 Infantry:
 	Voices:
-		Select: 15-I000, 15-I004, 15-I012, 15-I048
-		Move: 15-I018, 15-I024, 15-I044
-		Attack: 15-I044, 15-I050, 15-I044, 15-I046
-#		Feedback: 15-I058, 15-I064 # TODO
-		Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
-		Burned: DEDMAN2
-		Zapped: ELECTRO1
+		Select: 15-i000, 15-i004, 15-i012, 15-i048
+		Move: 15-i018, 15-i024, 15-i044
+		Attack: 15-i044, 15-i050, 15-i044, 15-i046
+#		Feedback: 15-i058, 15-i064 # TODO
+		Die: dedman1, dedman3, dedman4, dedman5, dedman6
+		Burned: dedman2
+		Zapped: electro1
 
 Rocket:
 	Voices:
-		Select: 15-I000, 15-I032, 15-I048
-		Move: 15-I008, 15-I014, 15-I026
-		Attack: 15-I008, 15-I014, 15-I026, 15-I050, 15-I060
-#		Feedback: 15-I058, 15-I064 #TODO
-		Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
-		Burned: DEDMAN2
-		Zapped: ELECTRO1
+		Select: 15-i000, 15-i032, 15-i048
+		Move: 15-i008, 15-i014, 15-i026
+		Attack: 15-i008, 15-i014, 15-i026, 15-i050, 15-i060
+#		Feedback: 15-i058, 15-i064 #TODO
+		Die: dedman1, dedman3, dedman4, dedman5, dedman6
+		Burned: dedman2
+		Zapped: electro1
 
 Umagon:
 	Voices:
-		Select: 10-I000, 10-I002, 10-I004, 10-I006
-		Move: 10-I016, 10-I020, 10-I022
-		Attack: 10-I024, 10-I026, 10-I028, 10-I030
-		Die: DEDGIRL1, DEDGIRL2, DEDGIRL4
-		Burned: DEDGIRL3
-		Zapped: ELECTRO1
+		Select: 10-i000, 10-i002, 10-i004, 10-i006
+		Move: 10-i016, 10-i020, 10-i022
+		Attack: 10-i024, 10-i026, 10-i028, 10-i030
+		Die: dedgirl1, dedgirl2, dedgirl4
+		Burned: dedgirl3
+		Zapped: electro1
 
 Ghost:
 	Voices:
-		Select: 14-I000, 14-I002, 14-I004
-		Move: 14-I008, 14-I010, 14-I012, 14-I014
-		Attack: 14-I008, 14-I010, 14-I014, 14-I016
-		Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
-		Burned: DEDMAN2
-		Zapped: ELECTRO1
+		Select: 14-i000, 14-i002, 14-i004
+		Move: 14-i008, 14-i010, 14-i012, 14-i014
+		Attack: 14-i008, 14-i010, 14-i014, 14-i016
+		Die: dedman1, dedman3, dedman4, dedman5, dedman6
+		Burned: dedman2
+		Zapped: electro1
 
 Medic:
 	Voices:
-		Select: 20-I000, 20-I004, 20-I006
-		Move: 20-I008, 20-I010, 20-I012
-		Action: 20-I016, 20-I018, 20-I020
-		Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
-		Burned: DEDMAN2
-		Zapped: ELECTRO1
+		Select: 20-i000, 20-i004, 20-i006
+		Move: 20-i008, 20-i010, 20-i012
+		Action: 20-i016, 20-i018, 20-i020
+		Die: dedman1, dedman3, dedman4, dedman5, dedman6
+		Burned: dedman2
+		Zapped: electro1
 
 Engineer:
 	Voices:
-		Select: 19-I000, 19-I002, 19-I006
-		Move: 19-I010, 19-I016
-		Action: 19-I018, 19-I016
-		Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
-		Burned: DEDMAN2
-		Zapped: ELECTRO1
+		Select: 19-i000, 19-i002, 19-i006
+		Move: 19-i010, 19-i016
+		Action: 19-i018, 19-i016
+		Die: dedman1, dedman3, dedman4, dedman5, dedman6
+		Burned: dedman2
+		Zapped: electro1
 
 JumpJet:
 	Voices:
-		Select: 15-I000, 15-I004, 15-I012, 15-I048
-		Move: 15-I018, 15-I024, 15-I044
-		Attack: 15-I044, 15-I050, 15-I044, 15-I046
-#		Feedback: 15-I058, 15-I064
-		Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
-		Burned: DEDMAN2
-		Zapped: ELECTRO1
+		Select: 15-i000, 15-i004, 15-i012, 15-i048
+		Move: 15-i018, 15-i024, 15-i044
+		Attack: 15-i044, 15-i050, 15-i044, 15-i046
+#		Feedback: 15-i058, 15-i064
+		Die: dedman1, dedman3, dedman4, dedman5, dedman6
+		Burned: dedman2
+		Zapped: electro1
 
 Weed:
 	Voices:
-		Select: 15-I000, 15-I006, 15-I040, 15-I042
-		Move: 15-I024, 15-I044
-		Attack: 15-I006, 15-I046
-#		Feedback: 15-I058, 15-I064 # TODO
-		Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
-		Burned: DEDMAN2
-		Zapped: ELECTRO1
+		Select: 15-i000, 15-i006, 15-i040, 15-i042
+		Move: 15-i024, 15-i044
+		Attack: 15-i006, 15-i046
+#		Feedback: 15-i058, 15-i064 # TODO
+		Die: dedman1, dedman3, dedman4, dedman5, dedman6
+		Burned: dedman2
+		Zapped: electro1
 
 Spy:
 	Voices:
-		Select: 21-I000, 21-I002, 21-I004
-		Move: 21-I010, 21-I012, 21-I016
-		Action: 21-I010, 21-I012, 21-I022
-#		Feedback: 21-I000, 21-I002 # TODO
-		Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
-		Burned: DEDMAN2
-		Zapped: ELECTRO1
+		Select: 21-i000, 21-i002, 21-i004
+		Move: 21-i010, 21-i012, 21-i016
+		Action: 21-i010, 21-i012, 21-i022
+#		Feedback: 21-i000, 21-i002 # TODO
+		Die: dedman1, dedman3, dedman4, dedman5, dedman6
+		Burned: dedman2
+		Zapped: electro1
 
 Hijacker:
 	Voices:
-		Select: 24-I000, 24-I002, 24-I004, 24-I006
-		Move: 24-I008, 24-I010, 24-I012, 24-I014
-		Action: 24-I016, 24-I018, 24-I020, 24-I022, 24-I024
-		Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
-		Burned: DEDMAN2
-		Zapped: ELECTRO1
+		Select: 24-i000, 24-i002, 24-i004, 24-i006
+		Move: 24-i008, 24-i010, 24-i012, 24-i014
+		Action: 24-i016, 24-i018, 24-i020, 24-i022, 24-i024
+		Die: dedman1, dedman3, dedman4, dedman5, dedman6
+		Burned: dedman2
+		Zapped: electro1
 
 Cyborg:
 	Voices:
-		Select: 22-I000, 22-I002, 22-I006
-		Move: 22-I008, 22-I010, 22-I014, 22-I016, 22-I020
-		Attack: 22-I008, 22-I010, 22-I012, 22-I018
+		Select: 22-i000, 22-i002, 22-i006
+		Move: 22-i008, 22-i010, 22-i014, 22-i016, 22-i020
+		Attack: 22-i008, 22-i010, 22-i012, 22-i018
 		Die: 22-n104, 22-n108
 		Burned: 22-n106
-		Zapped: ELECTRO1
+		Zapped: electro1
 
 CyborgCommando:
 	Voices:
-		Select: 23-I000, 23-I002, 23-I004, 23-I006
-		Move: 23-I008, 23-I010, 23-I012, 23-I016
-		Attack: 23-I014, 23-I018, 23-I020, 23-I022
+		Select: 23-i000, 23-i002, 23-i004, 23-i006
+		Move: 23-i008, 23-i010, 23-i012, 23-i016
+		Attack: 23-i014, 23-i018, 23-i020, 23-i022
 		Die: 22-n104, 22-n108
 		Burned: 22-n106
-		Zapped: ELECTRO1
+		Zapped: electro1
 
 Mutant:
 	Voices:
-		Select: 15-I032, 15-I048
-		Move: 15-I008,15-I014,15-I026
-		Attack: 15-I008,15-I014,15-I026,15-I050,15-I060
-		Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
-		Burned: DEDMAN2
-		Zapped: ELECTRO1
+		Select: 15-i032, 15-i048
+		Move: 15-i008,15-I014,15-I026
+		Attack: 15-i008,15-I014,15-I026,15-I050,15-I060
+		Die: dedman1, dedman3, dedman4, dedman5, dedman6
+		Burned: dedman2
+		Zapped: electro1
 
 Tratos:
 	Voices:
-		Select: 13-I000, 13-I002, 13-I004, 13-I006
-		Move: 13-I008, 13-I010, 13-I012, 13-I014
-		Attack: 13-I016, 13-I018, 13-I020
-		Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
-		Burned: DEDMAN2
-		Zapped: ELECTRO1
+		Select: 13-i000, 13-i002, 13-i004, 13-i006
+		Move: 13-i008, 13-i010, 13-i012, 13-i014
+		Attack: 13-i016, 13-i018, 13-i020
+		Die: dedman1, dedman3, dedman4, dedman5, dedman6
+		Burned: dedman2
+		Zapped: electro1
 
 Oxanna:
 	Voices:
-		Select: 11-I000, 11-I002, 11-I004, 11-I006
-		Move: 11-I008, 11-I010, 11-I012
-		Attack: 11-I014, 11-I016, 11-I018
-		Die: DEDGIRL1, DEDGIRL2, DEDGIRL4
-		Burned: DEDGIRL3
-		Zapped: ELECTRO1
+		Select: 11-i000, 11-i002, 11-i004, 11-i006
+		Move: 11-i008, 11-i010, 11-i012
+		Attack: 11-i014, 11-i016, 11-i018
+		Die: dedgirl1, dedgirl2, dedgirl4
+		Burned: dedgirl3
+		Zapped: electro1
 
 Slavick:
 	Voices:
-		Select: 12-I000, 12-I002, 12-I004
-		Move: 12-I006, 12-I008, 12-I010
-		Attack: 12-I012, 12-I014, 12-I016
-		Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
-		Burned: DEDMAN2
-		Zapped: ELECTRO1
+		Select: 12-i000, 12-i002, 12-i004
+		Move: 12-i006, 12-i008, 12-i010
+		Attack: 12-i012, 12-i014, 12-i016
+		Die: dedman1, dedman3, dedman4, dedman5, dedman6
+		Burned: dedman2
+		Zapped: electro1
 
 Fiend:
 	Voices:
-		Select: FIEND1
-		Attack: FIEND1
-		Move: FIEND1
-		Die: FIEND1
-		Burned: FIEND1
-		Zapped: FIEND1
+		Select: fiend1
+		Attack: fiend1
+		Move: fiend1
+		Die: fiend1
+		Burned: fiend1
+		Zapped: fiend1
 
 Vehicle:
 	Voices:
-		Select: 25-I000, 25-I002, 25-I004, 25-I006
-		Move: 25-I012, 25-I014, 25-I016, 25-I018, 25-I022
-		Attack: 25-I014, 25-I022, 25-I024, 25-I026
-		Unload: 25-I018
+		Select: 25-i000, 25-i002, 25-i004, 25-i006
+		Move: 25-i012, 25-i014, 25-i016, 25-i018, 25-i022
+		Attack: 25-i014, 25-i022, 25-i024, 25-i026
+		Unload: 25-i018
 
 Mech:
 	Voices:
-		Select: 15-I000, 15-I006, 15-I040, 15-I042
-		Move: 15-I024, 15-I044
-		Attack: 15-I006, 15-I046
+		Select: 15-i000, 15-i006, 15-i040, 15-i042
+		Move: 15-i024, 15-i044
+		Attack: 15-i006, 15-i046
 
 Heli:
 	Voices:
-		Select: 30-I000, 30-I002, 30-I004, 30-I006
-		Move: 30-I014, 30-I016, 30-I018, 30-I022
-		Attack: 30-I022, 30-I030, 30-I034, 30-I036
+		Select: 30-i000, 30-i002, 30-i004, 30-i006
+		Move: 30-i014, 30-i016, 30-i018, 30-i022
+		Attack: 30-i022, 30-i030, 30-i034, 30-i036
 
 Civilian:
 	Voices:
 		Select:
 		Move:
 		Attack:
-		Die: DEDMAN1, DEDMAN3, DEDMAN4, DEDMAN5, DEDMAN6
-		Burned: DEDMAN2
-		Zapped: ELECTRO1
+		Die: dedman1, dedman3, dedman4, dedman5, dedman6
+		Burned: dedman2
+		Zapped: electro1
 
 CivilianFemale: #can be used for female mutant as well
 	Voices:
 		Select:
 		Move:
 		Attack:
-		Die: DEDGIRL1, DEDGIRL2, DEDGIRL4
-		Burned: DEDGIRL3
-		Zapped: ELECTRO1
+		Die: dedgirl1, dedgirl2, dedgirl4
+		Burned: dedgirl3
+		Zapped: electro1
 
 Scrin:
 	Voices:
-		Select: 32-I000
-		Move: 32-I002, 32-I004
-		Attack: 32-I006
-		Die: 32-I008
+		Select: 32-i000
+		Move: 32-i002, 32-i004
+		Attack: 32-i006
+		Die: 32-i008