diff --git a/sound/direct_sound_data.inc b/sound/direct_sound_data.inc
index bc277d144..298088ef4 100644
--- a/sound/direct_sound_data.inc
+++ b/sound/direct_sound_data.inc
@@ -283,24 +283,24 @@ DirectSoundWaveData_bicycle_bell::
 	.incbin "sound/direct_sound_samples/bicycle_bell.bin"
 
 	.align 2
-DirectSoundWaveData_8725A2C::
-	.incbin "sound/direct_sound_samples/8725A2C.bin"
+DirectSoundWaveData_unknown_1::
+	.incbin "sound/direct_sound_samples/unknown_01.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_pizzicato_strings::
 	.incbin "sound/direct_sound_samples/sc88pro_pizzicato_strings.bin"
 
 	.align 2
-DirectSoundWaveData_872762C::
-	.incbin "sound/direct_sound_samples/872762C.bin"
+DirectSoundWaveData_unknown_2::
+	.incbin "sound/direct_sound_samples/unknown_02.bin"
 
 	.align 2
-DirectSoundWaveData_872921C::
-	.incbin "sound/direct_sound_samples/872921C.bin"
+DirectSoundWaveData_unknown_3::
+	.incbin "sound/direct_sound_samples/unknown_03.bin"
 
 	.align 2
-DirectSoundWaveData_872A5D0::
-	.incbin "sound/direct_sound_samples/872A5D0.bin"
+DirectSoundWaveData_unknown_4::
+	.incbin "sound/direct_sound_samples/unknown_04.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_wind::
@@ -311,32 +311,32 @@ DirectSoundWaveData_sc88pro_bubbles::
 	.incbin "sound/direct_sound_samples/sc88pro_bubbles.bin"
 
 	.align 2
-DirectSoundWaveData_872EEA8::
-	.incbin "sound/direct_sound_samples/872EEA8.bin"
+DirectSoundWaveData_unknown_5::
+	.incbin "sound/direct_sound_samples/unknown_05.bin"
 
 	.align 2
-DirectSoundWaveData_87301B0::
-	.incbin "sound/direct_sound_samples/87301B0.bin"
+DirectSoundWaveData_unknown_6::
+	.incbin "sound/direct_sound_samples/unknown_06.bin"
 
 	.align 2
 DirectSoundWaveData_trinity_30303_mega_bass::
 	.incbin "sound/direct_sound_samples/trinity_30303_mega_bass.bin"
 
 	.align 2
-DirectSoundWaveData_8734298::
-	.incbin "sound/direct_sound_samples/8734298.bin"
+DirectSoundWaveData_unknown_7::
+	.incbin "sound/direct_sound_samples/unknown_07.bin"
 
 	.align 2
-DirectSoundWaveData_87364A8::
-	.incbin "sound/direct_sound_samples/87364A8.bin"
+DirectSoundWaveData_unknown_8::
+	.incbin "sound/direct_sound_samples/unknown_08.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_tubular_bell::
 	.incbin "sound/direct_sound_samples/sc88pro_tubular_bell.bin"
 
 	.align 2
-DirectSoundWaveData_87385E4::
-	.incbin "sound/direct_sound_samples/87385E4.bin"
+DirectSoundWaveData_unknown_9::
+	.incbin "sound/direct_sound_samples/unknown_09.bin"
 
 	.align 2
 DirectSoundWaveData_trinity_big_boned::
@@ -351,40 +351,40 @@ DirectSoundWaveData_sc88pro_xylophone::
 	.incbin "sound/direct_sound_samples/sc88pro_xylophone.bin"
 
 	.align 2
-DirectSoundWaveData_873ECD8::
-	.incbin "sound/direct_sound_samples/873ECD8.bin"
+DirectSoundWaveData_unknown_10::
+	.incbin "sound/direct_sound_samples/unknown_10.bin"
 
 	.align 2
-DirectSoundWaveData_8740818::
-	.incbin "sound/direct_sound_samples/8740818.bin"
+DirectSoundWaveData_unknown_11::
+	.incbin "sound/direct_sound_samples/unknown_11.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_accordion::
 	.incbin "sound/direct_sound_samples/sc88pro_accordion.bin"
 
 	.align 2
-DirectSoundWaveData_87424B0::
-	.incbin "sound/direct_sound_samples/87424B0.bin"
+DirectSoundWaveData_unknown_12::
+	.incbin "sound/direct_sound_samples/unknown_12.bin"
 
 	.align 2
-DirectSoundWaveData_87430C0::
-	.incbin "sound/direct_sound_samples/87430C0.bin"
+DirectSoundWaveData_unknown_13::
+	.incbin "sound/direct_sound_samples/unknown_13.bin"
 
 	.align 2
-DirectSoundWaveData_8743C50::
-	.incbin "sound/direct_sound_samples/8743C50.bin"
+DirectSoundWaveData_unknown_14::
+	.incbin "sound/direct_sound_samples/unknown_14.bin"
 
 	.align 2
-DirectSoundWaveData_87446EC::
-	.incbin "sound/direct_sound_samples/87446EC.bin"
+DirectSoundWaveData_unknown_15::
+	.incbin "sound/direct_sound_samples/unknown_15.bin"
 
 	.align 2
-DirectSoundWaveData_8745034::
-	.incbin "sound/direct_sound_samples/8745034.bin"
+DirectSoundWaveData_unknown_16::
+	.incbin "sound/direct_sound_samples/unknown_16.bin"
 
 	.align 2
-DirectSoundWaveData_8745A7C::
-	.incbin "sound/direct_sound_samples/8745A7C.bin"
+DirectSoundWaveData_unknown_17::
+	.incbin "sound/direct_sound_samples/unknown_17.bin"
 
 	.align 2
 Cry_Bulbasaur::
@@ -1943,8 +1943,8 @@ DirectSoundWaveData_register_noise::
 	.incbin "sound/direct_sound_samples/register_noise.bin"
 
 	.align 2
-DirectSoundWaveData_88D6978::
-	.incbin "sound/direct_sound_samples/88D6978.bin"
+DirectSoundWaveData_unknown_18::
+	.incbin "sound/direct_sound_samples/unknown_18.bin"
 
 	.align 2
 DirectSoundWaveData_sc88pro_nylon_str_guitar::
diff --git a/sound/direct_sound_samples/8725A2C.aif b/sound/direct_sound_samples/unknown_01.aif
similarity index 100%
rename from sound/direct_sound_samples/8725A2C.aif
rename to sound/direct_sound_samples/unknown_01.aif
diff --git a/sound/direct_sound_samples/872762C.aif b/sound/direct_sound_samples/unknown_02.aif
similarity index 100%
rename from sound/direct_sound_samples/872762C.aif
rename to sound/direct_sound_samples/unknown_02.aif
diff --git a/sound/direct_sound_samples/872921C.aif b/sound/direct_sound_samples/unknown_03.aif
similarity index 100%
rename from sound/direct_sound_samples/872921C.aif
rename to sound/direct_sound_samples/unknown_03.aif
diff --git a/sound/direct_sound_samples/872A5D0.aif b/sound/direct_sound_samples/unknown_04.aif
similarity index 100%
rename from sound/direct_sound_samples/872A5D0.aif
rename to sound/direct_sound_samples/unknown_04.aif
diff --git a/sound/direct_sound_samples/872EEA8.aif b/sound/direct_sound_samples/unknown_05.aif
similarity index 100%
rename from sound/direct_sound_samples/872EEA8.aif
rename to sound/direct_sound_samples/unknown_05.aif
diff --git a/sound/direct_sound_samples/87301B0.aif b/sound/direct_sound_samples/unknown_06.aif
similarity index 100%
rename from sound/direct_sound_samples/87301B0.aif
rename to sound/direct_sound_samples/unknown_06.aif
diff --git a/sound/direct_sound_samples/8734298.aif b/sound/direct_sound_samples/unknown_07.aif
similarity index 100%
rename from sound/direct_sound_samples/8734298.aif
rename to sound/direct_sound_samples/unknown_07.aif
diff --git a/sound/direct_sound_samples/87364A8.aif b/sound/direct_sound_samples/unknown_08.aif
similarity index 100%
rename from sound/direct_sound_samples/87364A8.aif
rename to sound/direct_sound_samples/unknown_08.aif
diff --git a/sound/direct_sound_samples/87385E4.aif b/sound/direct_sound_samples/unknown_09.aif
similarity index 100%
rename from sound/direct_sound_samples/87385E4.aif
rename to sound/direct_sound_samples/unknown_09.aif
diff --git a/sound/direct_sound_samples/873ECD8.aif b/sound/direct_sound_samples/unknown_10.aif
similarity index 100%
rename from sound/direct_sound_samples/873ECD8.aif
rename to sound/direct_sound_samples/unknown_10.aif
diff --git a/sound/direct_sound_samples/8740818.aif b/sound/direct_sound_samples/unknown_11.aif
similarity index 100%
rename from sound/direct_sound_samples/8740818.aif
rename to sound/direct_sound_samples/unknown_11.aif
diff --git a/sound/direct_sound_samples/87424B0.aif b/sound/direct_sound_samples/unknown_12.aif
similarity index 100%
rename from sound/direct_sound_samples/87424B0.aif
rename to sound/direct_sound_samples/unknown_12.aif
diff --git a/sound/direct_sound_samples/87430C0.aif b/sound/direct_sound_samples/unknown_13.aif
similarity index 100%
rename from sound/direct_sound_samples/87430C0.aif
rename to sound/direct_sound_samples/unknown_13.aif
diff --git a/sound/direct_sound_samples/8743C50.aif b/sound/direct_sound_samples/unknown_14.aif
similarity index 100%
rename from sound/direct_sound_samples/8743C50.aif
rename to sound/direct_sound_samples/unknown_14.aif
diff --git a/sound/direct_sound_samples/87446EC.aif b/sound/direct_sound_samples/unknown_15.aif
similarity index 100%
rename from sound/direct_sound_samples/87446EC.aif
rename to sound/direct_sound_samples/unknown_15.aif
diff --git a/sound/direct_sound_samples/8745034.aif b/sound/direct_sound_samples/unknown_16.aif
similarity index 100%
rename from sound/direct_sound_samples/8745034.aif
rename to sound/direct_sound_samples/unknown_16.aif
diff --git a/sound/direct_sound_samples/8745A7C.aif b/sound/direct_sound_samples/unknown_17.aif
similarity index 100%
rename from sound/direct_sound_samples/8745A7C.aif
rename to sound/direct_sound_samples/unknown_17.aif
diff --git a/sound/direct_sound_samples/88D6978.aif b/sound/direct_sound_samples/unknown_18.aif
similarity index 100%
rename from sound/direct_sound_samples/88D6978.aif
rename to sound/direct_sound_samples/unknown_18.aif
diff --git a/sound/voicegroups/voicegroup098.inc b/sound/voicegroups/voicegroup098.inc
index d670cb16d..3a927368b 100644
--- a/sound/voicegroups/voicegroup098.inc
+++ b/sound/voicegroups/voicegroup098.inc
@@ -125,7 +125,7 @@ voicegroup098::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_directsound 60, 0, DirectSoundWaveData_873ECD8, 255, 255, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_10, 255, 255, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127
 	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup128.inc b/sound/voicegroups/voicegroup128.inc
index ce4904626..69b52d29d 100644
--- a/sound/voicegroups/voicegroup128.inc
+++ b/sound/voicegroups/voicegroup128.inc
@@ -8,17 +8,17 @@ voicegroup128::
 	voice_noise_alt 60, 0, 1, 0, 1, 0, 1
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 255, 165
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 1
-	voice_directsound 60, 0, DirectSoundWaveData_8725A2C, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_1, 255, 0, 255, 165
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 0, 255, 127
-	voice_directsound 60, 0, DirectSoundWaveData_872762C, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_2, 255, 0, 255, 127
 	voice_noise_alt 60, 0, 1, 0, 2, 0, 0
 	voice_square_1 60, 0, 103, 3, 2, 7, 0, 0
 	voice_square_2 60, 0, 3, 2, 7, 0, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 127
-	voice_directsound 60, 0, DirectSoundWaveData_872921C, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_3, 255, 0, 255, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 204, 0, 127
 	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 1
-	voice_directsound 60, 0, DirectSoundWaveData_872A5D0, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_4, 255, 0, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127
 	voice_square_1 60, 0, 103, 0, 0, 7, 0, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 127
@@ -26,22 +26,22 @@ voicegroup128::
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_bubbles, 255, 0, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 127
 	voice_noise_alt 60, 0, 0, 0, 7, 15, 1
-	voice_directsound 60, 0, DirectSoundWaveData_872EEA8, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_5, 255, 0, 255, 127
 	voice_noise_alt 60, 0, 1, 0, 7, 15, 1
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 246, 0, 127
-	voice_directsound 60, 0, DirectSoundWaveData_87301B0, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_6, 255, 0, 255, 127
 	voice_square_1_alt 60, 0, 19, 2, 0, 2, 0, 0
 	voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 0, 255, 127
 	voice_square_1 60, 0, 103, 0, 0, 0, 15, 0
-	voice_directsound_alt 60, 0, DirectSoundWaveData_87301B0, 255, 0, 255, 127
+	voice_directsound_alt 60, 0, DirectSoundWaveData_unknown_6, 255, 0, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 255, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 0, 255, 127
-	voice_directsound 60, 0, DirectSoundWaveData_8734298, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_7, 255, 0, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 242, 0, 0
-	voice_directsound 60, 0, DirectSoundWaveData_87364A8, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_8, 255, 0, 255, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
 	voice_directsound 60, 0, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188
-	voice_directsound 60, 0, DirectSoundWaveData_87385E4, 255, 249, 0, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_9, 255, 249, 0, 165
 	voice_square_1 60, 0, 0, 0, 4, 6, 0, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 13, 0, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 13, 0, 255, 127
@@ -60,10 +60,10 @@ voicegroup128::
 	voice_noise_alt 60, 0, 0, 1, 6, 0, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 255, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127
-	voice_directsound 60, 0, DirectSoundWaveData_873ECD8, 255, 255, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_10, 255, 255, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 11, 242, 0, 127
 	voice_square_1_alt 60, 0, 0, 2, 4, 6, 0, 0
-	voice_directsound 60, 0, DirectSoundWaveData_8740818, 255, 255, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_11, 255, 255, 255, 127
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165
 	voice_directsound 60, 0, DirectSoundWaveData_unused_sc55_tom, 255, 0, 255, 165
 	voice_noise_alt 60, 0, 0, 5, 7, 15, 1
@@ -122,10 +122,10 @@ voicegroup128::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_directsound 60, 0, DirectSoundWaveData_87424B0, 255, 0, 255, 165
-	voice_directsound 60, 0, DirectSoundWaveData_87430C0, 255, 0, 255, 165
-	voice_directsound 60, 0, DirectSoundWaveData_8743C50, 255, 0, 255, 165
-	voice_directsound 60, 0, DirectSoundWaveData_87446EC, 255, 0, 255, 165
-	voice_directsound 60, 0, DirectSoundWaveData_8745034, 255, 0, 255, 165
-	voice_directsound 60, 0, DirectSoundWaveData_8745A7C, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_12, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_13, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_14, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_15, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_16, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_17, 255, 0, 255, 165
 
diff --git a/sound/voicegroups/voicegroup129.inc b/sound/voicegroups/voicegroup129.inc
index ad94d1f70..8e136bdf4 100644
--- a/sound/voicegroups/voicegroup129.inc
+++ b/sound/voicegroups/voicegroup129.inc
@@ -5,11 +5,11 @@ voicegroup129::
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
 	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 226, 25, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_directsound 60, 0, DirectSoundWaveData_8725A2C, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_1, 255, 0, 255, 165
 	voice_directsound 60, 0, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231
 	voice_directsound 60, 0, DirectSoundWaveData_sd90_open_triangle, 255, 204, 128, 249
 	voice_directsound 60, 0, DirectSoundWaveData_register_noise, 255, 0, 255, 76
-	voice_directsound 60, 0, DirectSoundWaveData_88D6978, 255, 0, 206, 204
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_18, 255, 0, 206, 204
 	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 206, 38
 	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 206, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
diff --git a/sound/voicegroups/voicegroup163.inc b/sound/voicegroups/voicegroup163.inc
index b8a3303f0..cd7c6ebef 100644
--- a/sound/voicegroups/voicegroup163.inc
+++ b/sound/voicegroups/voicegroup163.inc
@@ -58,7 +58,7 @@ voicegroup163::
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_keysplit voicegroup007, KeySplitTable3
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
-	voice_directsound 60, 0, DirectSoundWaveData_88D6978, 255, 0, 206, 204
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_18, 255, 0, 206, 204
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0