Use generic names for noise instruments

coming up with satisfactory names is hard, besides this will improve compatibility with crystal

57 files changed, 57 insertions, 57 deletions

diff --git a/audio/sfx/snare1_1.asm b/audio/sfx/noise_instrument01_1.asm
index a6e569a5..e545b030 100644
--- a/audio/sfx/snare1_1.asm
+++ b/audio/sfx/noise_instrument01_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare1_1_Ch8:
+SFX_Noise_Instrument01_1_Ch8:
 	noise_note 0, 12, 1, 51
 	sound_ret
diff --git a/audio/sfx/snare1_2.asm b/audio/sfx/noise_instrument01_2.asm
index 336c9f22..3f4d2bb0 100644
--- a/audio/sfx/snare1_2.asm
+++ b/audio/sfx/noise_instrument01_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare1_2_Ch8:
+SFX_Noise_Instrument01_2_Ch8:
 	noise_note 0, 12, 1, 51
 	sound_ret
diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/noise_instrument01_3.asm
index 84108aed..ac360f2e 100644
--- a/audio/sfx/snare1_3.asm
+++ b/audio/sfx/noise_instrument01_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare1_3_Ch8:
+SFX_Noise_Instrument01_3_Ch8:
 	noise_note 0, 12, 1, 51
 	sound_ret
diff --git a/audio/sfx/snare2_1.asm b/audio/sfx/noise_instrument02_1.asm
index fddcfe01..12a7d226 100644
--- a/audio/sfx/snare2_1.asm
+++ b/audio/sfx/noise_instrument02_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare2_1_Ch8:
+SFX_Noise_Instrument02_1_Ch8:
 	noise_note 0, 11, 1, 51
 	sound_ret
diff --git a/audio/sfx/snare2_2.asm b/audio/sfx/noise_instrument02_2.asm
index 522abb40..354bbdbc 100644
--- a/audio/sfx/snare2_2.asm
+++ b/audio/sfx/noise_instrument02_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare2_2_Ch8:
+SFX_Noise_Instrument02_2_Ch8:
 	noise_note 0, 11, 1, 51
 	sound_ret
diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/noise_instrument02_3.asm
index c41fadbb..2f7f0d6f 100644
--- a/audio/sfx/snare2_3.asm
+++ b/audio/sfx/noise_instrument02_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare2_3_Ch8:
+SFX_Noise_Instrument02_3_Ch8:
 	noise_note 0, 11, 1, 51
 	sound_ret
diff --git a/audio/sfx/snare3_1.asm b/audio/sfx/noise_instrument03_1.asm
index 0c9cfbdb..b75b6479 100644
--- a/audio/sfx/snare3_1.asm
+++ b/audio/sfx/noise_instrument03_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare3_1_Ch8:
+SFX_Noise_Instrument03_1_Ch8:
 	noise_note 0, 10, 1, 51
 	sound_ret
diff --git a/audio/sfx/snare3_2.asm b/audio/sfx/noise_instrument03_2.asm
index d5990157..3551baef 100644
--- a/audio/sfx/snare3_2.asm
+++ b/audio/sfx/noise_instrument03_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare3_2_Ch8:
+SFX_Noise_Instrument03_2_Ch8:
 	noise_note 0, 10, 1, 51
 	sound_ret
diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/noise_instrument03_3.asm
index 807cfd03..c132ab64 100644
--- a/audio/sfx/snare3_3.asm
+++ b/audio/sfx/noise_instrument03_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare3_3_Ch8:
+SFX_Noise_Instrument03_3_Ch8:
 	noise_note 0, 10, 1, 51
 	sound_ret
diff --git a/audio/sfx/snare4_1.asm b/audio/sfx/noise_instrument04_1.asm
index fe2552d9..303f1f1f 100644
--- a/audio/sfx/snare4_1.asm
+++ b/audio/sfx/noise_instrument04_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare4_1_Ch8:
+SFX_Noise_Instrument04_1_Ch8:
 	noise_note 0, 8, 1, 51
 	sound_ret
diff --git a/audio/sfx/snare4_2.asm b/audio/sfx/noise_instrument04_2.asm
index 0913ba2b..b43ae39d 100644
--- a/audio/sfx/snare4_2.asm
+++ b/audio/sfx/noise_instrument04_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare4_2_Ch8:
+SFX_Noise_Instrument04_2_Ch8:
 	noise_note 0, 8, 1, 51
 	sound_ret
diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/noise_instrument04_3.asm
index 3aeeb49b..fcd27433 100644
--- a/audio/sfx/snare4_3.asm
+++ b/audio/sfx/noise_instrument04_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare4_3_Ch8:
+SFX_Noise_Instrument04_3_Ch8:
 	noise_note 0, 8, 1, 51
 	sound_ret
diff --git a/audio/sfx/snare5_1.asm b/audio/sfx/noise_instrument05_1.asm
index 21d4996d..d119b958 100644
--- a/audio/sfx/snare5_1.asm
+++ b/audio/sfx/noise_instrument05_1.asm
@@ -1,4 +1,4 @@
-SFX_Snare5_1_Ch8:
+SFX_Noise_Instrument05_1_Ch8:
 	noise_note 7, 8, 4, 55
 	noise_note 6, 8, 4, 54
 	noise_note 5, 8, 3, 53
diff --git a/audio/sfx/snare5_2.asm b/audio/sfx/noise_instrument05_2.asm
index c37865a0..1a0e63b5 100644
--- a/audio/sfx/snare5_2.asm
+++ b/audio/sfx/noise_instrument05_2.asm
@@ -1,4 +1,4 @@
-SFX_Snare5_2_Ch8:
+SFX_Noise_Instrument05_2_Ch8:
 	noise_note 7, 8, 4, 55
 	noise_note 6, 8, 4, 54
 	noise_note 5, 8, 3, 53
diff --git a/audio/sfx/snare5_3.asm b/audio/sfx/noise_instrument05_3.asm
index d49211d0..a0fec98f 100644
--- a/audio/sfx/snare5_3.asm
+++ b/audio/sfx/noise_instrument05_3.asm
@@ -1,4 +1,4 @@
-SFX_Snare5_3_Ch8:
+SFX_Noise_Instrument05_3_Ch8:
 	noise_note 7, 8, 4, 55
 	noise_note 6, 8, 4, 54
 	noise_note 5, 8, 3, 53
diff --git a/audio/sfx/triangle1_1.asm b/audio/sfx/noise_instrument06_1.asm
index df952676..1412fc39 100644
--- a/audio/sfx/triangle1_1.asm
+++ b/audio/sfx/noise_instrument06_1.asm
@@ -1,3 +1,3 @@
-SFX_Triangle1_1_Ch8:
+SFX_Noise_Instrument06_1_Ch8:
 	noise_note 0, 5, 1, 42
 	sound_ret
diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/noise_instrument06_2.asm
index a90cec67..bb591031 100644
--- a/audio/sfx/triangle1_2.asm
+++ b/audio/sfx/noise_instrument06_2.asm
@@ -1,3 +1,3 @@
-SFX_Triangle1_2_Ch8:
+SFX_Noise_Instrument06_2_Ch8:
 	noise_note 0, 5, 1, 42
 	sound_ret
diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/noise_instrument06_3.asm
index e897dd61..b5110d40 100644
--- a/audio/sfx/triangle1_3.asm
+++ b/audio/sfx/noise_instrument06_3.asm
@@ -1,3 +1,3 @@
-SFX_Triangle1_3_Ch8:
+SFX_Noise_Instrument06_3_Ch8:
 	noise_note 0, 5, 1, 42
 	sound_ret
diff --git a/audio/sfx/triangle2_1.asm b/audio/sfx/noise_instrument07_1.asm
index df7e39ed..24f481bc 100644
--- a/audio/sfx/triangle2_1.asm
+++ b/audio/sfx/noise_instrument07_1.asm
@@ -1,4 +1,4 @@
-SFX_Triangle2_1_Ch8:
+SFX_Noise_Instrument07_1_Ch8:
 	noise_note 1, 4, 1, 43
 	noise_note 0, 6, 1, 42
 	sound_ret
diff --git a/audio/sfx/triangle2_2.asm b/audio/sfx/noise_instrument07_2.asm
index 39934efa..87057ed1 100644
--- a/audio/sfx/triangle2_2.asm
+++ b/audio/sfx/noise_instrument07_2.asm
@@ -1,4 +1,4 @@
-SFX_Triangle2_2_Ch8:
+SFX_Noise_Instrument07_2_Ch8:
 	noise_note 1, 4, 1, 43
 	noise_note 0, 6, 1, 42
 	sound_ret
diff --git a/audio/sfx/triangle2_3.asm b/audio/sfx/noise_instrument07_3.asm
index 370e13e7..3beb3f2c 100644
--- a/audio/sfx/triangle2_3.asm
+++ b/audio/sfx/noise_instrument07_3.asm
@@ -1,4 +1,4 @@
-SFX_Triangle2_3_Ch8:
+SFX_Noise_Instrument07_3_Ch8:
 	noise_note 1, 4, 1, 43
 	noise_note 0, 6, 1, 42
 	sound_ret
diff --git a/audio/sfx/snare6_1.asm b/audio/sfx/noise_instrument08_1.asm
index 03a63d40..60db9e0f 100644
--- a/audio/sfx/snare6_1.asm
+++ b/audio/sfx/noise_instrument08_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare6_1_Ch8:
+SFX_Noise_Instrument08_1_Ch8:
 	noise_note 0, 8, 1, 16
 	sound_ret
diff --git a/audio/sfx/snare6_2.asm b/audio/sfx/noise_instrument08_2.asm
index 7adad3fb..89e5b445 100644
--- a/audio/sfx/snare6_2.asm
+++ b/audio/sfx/noise_instrument08_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare6_2_Ch8:
+SFX_Noise_Instrument08_2_Ch8:
 	noise_note 0, 8, 1, 16
 	sound_ret
diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/noise_instrument08_3.asm
index 9a6b7be3..c63be9b4 100644
--- a/audio/sfx/snare6_3.asm
+++ b/audio/sfx/noise_instrument08_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare6_3_Ch8:
+SFX_Noise_Instrument08_3_Ch8:
 	noise_note 0, 8, 1, 16
 	sound_ret
diff --git a/audio/sfx/snare7_1.asm b/audio/sfx/noise_instrument09_1.asm
index 1e216fea..047f5469 100644
--- a/audio/sfx/snare7_1.asm
+++ b/audio/sfx/noise_instrument09_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare7_1_Ch8:
+SFX_Noise_Instrument09_1_Ch8:
 	noise_note 0, 8, 2, 35
 	sound_ret
diff --git a/audio/sfx/snare7_2.asm b/audio/sfx/noise_instrument09_2.asm
index 11a13239..093f912e 100644
--- a/audio/sfx/snare7_2.asm
+++ b/audio/sfx/noise_instrument09_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare7_2_Ch8:
+SFX_Noise_Instrument09_2_Ch8:
 	noise_note 0, 8, 2, 35
 	sound_ret
diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/noise_instrument09_3.asm
index c9d96902..2ab061db 100644
--- a/audio/sfx/snare7_3.asm
+++ b/audio/sfx/noise_instrument09_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare7_3_Ch8:
+SFX_Noise_Instrument09_3_Ch8:
 	noise_note 0, 8, 2, 35
 	sound_ret
diff --git a/audio/sfx/snare8_1.asm b/audio/sfx/noise_instrument10_1.asm
index 9dcc4381..1628fb88 100644
--- a/audio/sfx/snare8_1.asm
+++ b/audio/sfx/noise_instrument10_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare8_1_Ch8:
+SFX_Noise_Instrument10_1_Ch8:
 	noise_note 0, 8, 2, 37
 	sound_ret
diff --git a/audio/sfx/snare8_2.asm b/audio/sfx/noise_instrument10_2.asm
index 020de92f..e1ed23ce 100644
--- a/audio/sfx/snare8_2.asm
+++ b/audio/sfx/noise_instrument10_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare8_2_Ch8:
+SFX_Noise_Instrument10_2_Ch8:
 	noise_note 0, 8, 2, 37
 	sound_ret
diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/noise_instrument10_3.asm
index ecb6a9a7..a175ad17 100644
--- a/audio/sfx/snare8_3.asm
+++ b/audio/sfx/noise_instrument10_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare8_3_Ch8:
+SFX_Noise_Instrument10_3_Ch8:
 	noise_note 0, 8, 2, 37
 	sound_ret
diff --git a/audio/sfx/snare9_1.asm b/audio/sfx/noise_instrument11_1.asm
index 674efb12..e2f8729e 100644
--- a/audio/sfx/snare9_1.asm
+++ b/audio/sfx/noise_instrument11_1.asm
@@ -1,3 +1,3 @@
-SFX_Snare9_1_Ch8:
+SFX_Noise_Instrument11_1_Ch8:
 	noise_note 0, 8, 2, 38
 	sound_ret
diff --git a/audio/sfx/snare9_2.asm b/audio/sfx/noise_instrument11_2.asm
index 9d8f307d..925c421a 100644
--- a/audio/sfx/snare9_2.asm
+++ b/audio/sfx/noise_instrument11_2.asm
@@ -1,3 +1,3 @@
-SFX_Snare9_2_Ch8:
+SFX_Noise_Instrument11_2_Ch8:
 	noise_note 0, 8, 2, 38
 	sound_ret
diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/noise_instrument11_3.asm
index 6bfd1973..72f54e99 100644
--- a/audio/sfx/snare9_3.asm
+++ b/audio/sfx/noise_instrument11_3.asm
@@ -1,3 +1,3 @@
-SFX_Snare9_3_Ch8:
+SFX_Noise_Instrument11_3_Ch8:
 	noise_note 0, 8, 2, 38
 	sound_ret
diff --git a/audio/sfx/cymbal1_1.asm b/audio/sfx/noise_instrument12_1.asm
index 693bb0c5..f1e6379a 100644
--- a/audio/sfx/cymbal1_1.asm
+++ b/audio/sfx/noise_instrument12_1.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal1_1_Ch8:
+SFX_Noise_Instrument12_1_Ch8:
 	noise_note 0, 10, 1, 16
 	sound_ret
diff --git a/audio/sfx/cymbal1_2.asm b/audio/sfx/noise_instrument12_2.asm
index 206d44ae..f9c2e1a9 100644
--- a/audio/sfx/cymbal1_2.asm
+++ b/audio/sfx/noise_instrument12_2.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal1_2_Ch8:
+SFX_Noise_Instrument12_2_Ch8:
 	noise_note 0, 10, 1, 16
 	sound_ret
diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/noise_instrument12_3.asm
index 9389cc6f..b5347639 100644
--- a/audio/sfx/cymbal1_3.asm
+++ b/audio/sfx/noise_instrument12_3.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal1_3_Ch8:
+SFX_Noise_Instrument12_3_Ch8:
 	noise_note 0, 10, 1, 16
 	sound_ret
diff --git a/audio/sfx/cymbal2_2.asm b/audio/sfx/noise_instrument13_1.asm
index ab0a2edd..50569b26 100644
--- a/audio/sfx/cymbal2_2.asm
+++ b/audio/sfx/noise_instrument13_1.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal2_2_Ch8:
+SFX_Noise_Instrument13_1_Ch8:
 	noise_note 0, 10, 2, 17
 	sound_ret
diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/noise_instrument13_2.asm
index 26f7048a..5a5120f6 100644
--- a/audio/sfx/cymbal2_3.asm
+++ b/audio/sfx/noise_instrument13_2.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal2_3_Ch8:
+SFX_Noise_Instrument13_2_Ch8:
 	noise_note 0, 10, 2, 17
 	sound_ret
diff --git a/audio/sfx/cymbal2_1.asm b/audio/sfx/noise_instrument13_3.asm
index 3f050d96..848746d7 100644
--- a/audio/sfx/cymbal2_1.asm
+++ b/audio/sfx/noise_instrument13_3.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal2_1_Ch8:
+SFX_Noise_Instrument13_3_Ch8:
 	noise_note 0, 10, 2, 17
 	sound_ret
diff --git a/audio/sfx/cymbal3_1.asm b/audio/sfx/noise_instrument14_1.asm
index 179de2f0..9621ef42 100644
--- a/audio/sfx/cymbal3_1.asm
+++ b/audio/sfx/noise_instrument14_1.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal3_1_Ch8:
+SFX_Noise_Instrument14_1_Ch8:
 	noise_note 0, 10, 2, 80
 	sound_ret
diff --git a/audio/sfx/cymbal3_2.asm b/audio/sfx/noise_instrument14_2.asm
index 09e3b6e1..d413fb1f 100644
--- a/audio/sfx/cymbal3_2.asm
+++ b/audio/sfx/noise_instrument14_2.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal3_2_Ch8:
+SFX_Noise_Instrument14_2_Ch8:
 	noise_note 0, 10, 2, 80
 	sound_ret
diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/noise_instrument14_3.asm
index a7af3bb0..bc115181 100644
--- a/audio/sfx/cymbal3_3.asm
+++ b/audio/sfx/noise_instrument14_3.asm
@@ -1,3 +1,3 @@
-SFX_Cymbal3_3_Ch8:
+SFX_Noise_Instrument14_3_Ch8:
 	noise_note 0, 10, 2, 80
 	sound_ret
diff --git a/audio/sfx/muted_snare1_1.asm b/audio/sfx/noise_instrument15_1.asm
index 52eb96d7..308746c0 100644
--- a/audio/sfx/muted_snare1_1.asm
+++ b/audio/sfx/noise_instrument15_1.asm
@@ -1,4 +1,4 @@
-SFX_Muted_Snare1_1_Ch8:
+SFX_Noise_Instrument15_1_Ch8:
 	noise_note 0, 10, 1, 24
 	noise_note 0, 3, 1, 51
 	sound_ret
diff --git a/audio/sfx/muted_snare1_2.asm b/audio/sfx/noise_instrument15_2.asm
index c3e29c16..c1f63942 100644
--- a/audio/sfx/muted_snare1_2.asm
+++ b/audio/sfx/noise_instrument15_2.asm
@@ -1,4 +1,4 @@
-SFX_Muted_Snare1_2_Ch8:
+SFX_Noise_Instrument15_2_Ch8:
 	noise_note 0, 10, 1, 24
 	noise_note 0, 3, 1, 51
 	sound_ret
diff --git a/audio/sfx/muted_snare1_3.asm b/audio/sfx/noise_instrument15_3.asm
index a83ecd94..f77872ae 100644
--- a/audio/sfx/muted_snare1_3.asm
+++ b/audio/sfx/noise_instrument15_3.asm
@@ -1,4 +1,4 @@
-SFX_Muted_Snare1_3_Ch8:
+SFX_Noise_Instrument15_3_Ch8:
 	noise_note 0, 10, 1, 24
 	noise_note 0, 3, 1, 51
 	sound_ret
diff --git a/audio/sfx/triangle3_1.asm b/audio/sfx/noise_instrument16_1.asm
index 18b140e2..ac830985 100644
--- a/audio/sfx/triangle3_1.asm
+++ b/audio/sfx/noise_instrument16_1.asm
@@ -1,4 +1,4 @@
-SFX_Triangle3_1_Ch8:
+SFX_Noise_Instrument16_1_Ch8:
 	noise_note 2, 9, 1, 40
 	noise_note 0, 7, 1, 24
 	sound_ret
diff --git a/audio/sfx/triangle3_2.asm b/audio/sfx/noise_instrument16_2.asm
index c03be804..e61531bf 100644
--- a/audio/sfx/triangle3_2.asm
+++ b/audio/sfx/noise_instrument16_2.asm
@@ -1,4 +1,4 @@
-SFX_Triangle3_2_Ch8:
+SFX_Noise_Instrument16_2_Ch8:
 	noise_note 2, 9, 1, 40
 	noise_note 0, 7, 1, 24
 	sound_ret
diff --git a/audio/sfx/triangle3_3.asm b/audio/sfx/noise_instrument16_3.asm
index 95a047ae..99dbca77 100644
--- a/audio/sfx/triangle3_3.asm
+++ b/audio/sfx/noise_instrument16_3.asm
@@ -1,4 +1,4 @@
-SFX_Triangle3_3_Ch8:
+SFX_Noise_Instrument16_3_Ch8:
 	noise_note 2, 9, 1, 40
 	noise_note 0, 7, 1, 24
 	sound_ret
diff --git a/audio/sfx/muted_snare2_1.asm b/audio/sfx/noise_instrument17_1.asm
index a8066238..41565402 100644
--- a/audio/sfx/muted_snare2_1.asm
+++ b/audio/sfx/noise_instrument17_1.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare2_1_Ch8:
+SFX_Noise_Instrument17_1_Ch8:
 	noise_note 0, 9, 1, 34
 	sound_ret
diff --git a/audio/sfx/muted_snare2_2.asm b/audio/sfx/noise_instrument17_2.asm
index 32bb41f5..f89ec777 100644
--- a/audio/sfx/muted_snare2_2.asm
+++ b/audio/sfx/noise_instrument17_2.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare2_2_Ch8:
+SFX_Noise_Instrument17_2_Ch8:
 	noise_note 0, 9, 1, 34
 	sound_ret
diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/noise_instrument17_3.asm
index 5c3b743e..9330fbc0 100644
--- a/audio/sfx/muted_snare2_3.asm
+++ b/audio/sfx/noise_instrument17_3.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare2_3_Ch8:
+SFX_Noise_Instrument17_3_Ch8:
 	noise_note 0, 9, 1, 34
 	sound_ret
diff --git a/audio/sfx/muted_snare3_1.asm b/audio/sfx/noise_instrument18_1.asm
index 0538f8d5..e77e331d 100644
--- a/audio/sfx/muted_snare3_1.asm
+++ b/audio/sfx/noise_instrument18_1.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare3_1_Ch8:
+SFX_Noise_Instrument18_1_Ch8:
 	noise_note 0, 7, 1, 34
 	sound_ret
diff --git a/audio/sfx/muted_snare3_2.asm b/audio/sfx/noise_instrument18_2.asm
index 20c3772c..e937f9f6 100644
--- a/audio/sfx/muted_snare3_2.asm
+++ b/audio/sfx/noise_instrument18_2.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare3_2_Ch8:
+SFX_Noise_Instrument18_2_Ch8:
 	noise_note 0, 7, 1, 34
 	sound_ret
diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/noise_instrument18_3.asm
index 2ac3f874..59a5d069 100644
--- a/audio/sfx/muted_snare3_3.asm
+++ b/audio/sfx/noise_instrument18_3.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare3_3_Ch8:
+SFX_Noise_Instrument18_3_Ch8:
 	noise_note 0, 7, 1, 34
 	sound_ret
diff --git a/audio/sfx/muted_snare4_1.asm b/audio/sfx/noise_instrument19_1.asm
index 575829ae..2fa183d6 100644
--- a/audio/sfx/muted_snare4_1.asm
+++ b/audio/sfx/noise_instrument19_1.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare4_1_Ch8:
+SFX_Noise_Instrument19_1_Ch8:
 	noise_note 0, 6, 1, 34
 	sound_ret
diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/noise_instrument19_2.asm
index 19744539..49d09fcc 100644
--- a/audio/sfx/muted_snare4_2.asm
+++ b/audio/sfx/noise_instrument19_2.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare4_2_Ch8:
+SFX_Noise_Instrument19_2_Ch8:
 	noise_note 0, 6, 1, 34
 	sound_ret
diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/noise_instrument19_3.asm
index 188f9bff..a90b3e4b 100644
--- a/audio/sfx/muted_snare4_3.asm
+++ b/audio/sfx/noise_instrument19_3.asm
@@ -1,3 +1,3 @@
-SFX_Muted_Snare4_3_Ch8:
+SFX_Noise_Instrument19_3_Ch8:
 	noise_note 0, 6, 1, 34
 	sound_ret