diff --git a/assets.json b/assets.json
index 691735f2c3..a94358afc1 100644
--- a/assets.json
+++ b/assets.json
@@ -1861,16 +1861,16 @@
 "textures/water/jrb_textures.0A000.rgba16.png": [32,32,2048,{"jp":[3354832,40960],"us":[3361584,40960],"eu":[3235184,40960],"sh":[3209552,40960]}],
 "textures/water/jrb_textures.0A800.rgba16.png": [64,32,4096,{"jp":[3354832,43008],"us":[3361584,43008],"eu":[3235184,43008],"sh":[3209552,43008]}],
 "textures/water/jrb_textures.0B800.rgba16.png": [64,32,4096,{"jp":[3354832,47104],"us":[3361584,47104],"eu":[3235184,47104],"sh":[3209552,47104]}],
-"sound/samples/bowser_organ/00_organ_1.aiff": [0,{"jp":["@sound",195],"us":["@sound",216],"eu":["@sound",216]}],
-"sound/samples/bowser_organ/01_organ_1_lq.aiff": [0,{"jp":["@sound",196],"us":["@sound",217],"eu":["@sound",217]}],
-"sound/samples/bowser_organ/02_boys_choir.aiff": [0,{"jp":["@sound",197],"us":["@sound",218],"eu":["@sound",218]}],
-"sound/samples/course_start/00_la.aiff": [0,{"jp":["@sound",194],"us":["@sound",215],"eu":["@sound",215]}],
-"sound/samples/instruments/00.aiff": [0,{"jp":["@sound",120],"us":["@sound",141],"eu":["@sound",141],"sh":["@sound",141]}],
-"sound/samples/instruments/01_banjo_1.aiff": [0,{"jp":["@sound",121],"us":["@sound",142],"eu":["@sound",142],"sh":["@sound",142]}],
-"sound/samples/instruments/02.aiff": [0,{"jp":["@sound",122],"us":["@sound",143],"eu":["@sound",143],"sh":["@sound",143]}],
-"sound/samples/instruments/03_human_whistle.aiff": [0,{"jp":["@sound",123],"us":["@sound",144],"eu":["@sound",144],"sh":["@sound",144]}],
-"sound/samples/instruments/04_bright_piano.aiff": [0,{"jp":["@sound",124],"us":["@sound",145],"eu":["@sound",145],"sh":["@sound",145]}],
-"sound/samples/instruments/05_acoustic_bass.aiff": [0,{"jp":["@sound",125],"us":["@sound",146],"eu":["@sound",146],"sh":["@sound",146]}],
+"sound/samples/bowser_organ/00_organ_C3.aiff": [0,{"jp":["@sound",195],"us":["@sound",216],"eu":["@sound",216]}],
+"sound/samples/bowser_organ/01_organ_C4.aiff": [0,{"jp":["@sound",196],"us":["@sound",217],"eu":["@sound",217]}],
+"sound/samples/bowser_organ/02_boys_choir_Bb4.aiff": [0,{"jp":["@sound",197],"us":["@sound",218],"eu":["@sound",218]}],
+"sound/samples/course_start/00_la_E3.aiff": [0,{"jp":["@sound",194],"us":["@sound",215],"eu":["@sound",215]}],
+"sound/samples/instruments/00_banjo_D2.aiff": [0,{"jp":["@sound",120],"us":["@sound",141],"eu":["@sound",141],"sh":["@sound",141]}],
+"sound/samples/instruments/01_banjo_A2.aiff": [0,{"jp":["@sound",121],"us":["@sound",142],"eu":["@sound",142],"sh":["@sound",142]}],
+"sound/samples/instruments/02_violin_B2.aiff": [0,{"jp":["@sound",122],"us":["@sound",143],"eu":["@sound",143],"sh":["@sound",143]}],
+"sound/samples/instruments/03_human_whistle_C3.aiff": [0,{"jp":["@sound",123],"us":["@sound",144],"eu":["@sound",144],"sh":["@sound",144]}],
+"sound/samples/instruments/04_bright_piano_G#3.aiff": [0,{"jp":["@sound",124],"us":["@sound",145],"eu":["@sound",145],"sh":["@sound",145]}],
+"sound/samples/instruments/05_acoustic_bass_A1.aiff": [0,{"jp":["@sound",125],"us":["@sound",146],"eu":["@sound",146],"sh":["@sound",146]}],
 "sound/samples/instruments/06_kick_drum_1.aiff": [0,{"jp":["@sound",126],"us":["@sound",147],"eu":["@sound",147],"sh":["@sound",147]}],
 "sound/samples/instruments/07_rimshot.aiff": [0,{"jp":["@sound",127],"us":["@sound",148],"eu":["@sound",148],"sh":["@sound",148]}],
 "sound/samples/instruments/08.aiff": [0,{"jp":["@sound",128],"us":["@sound",149],"eu":["@sound",149],"sh":["@sound",149]}],
@@ -1885,63 +1885,63 @@
 "sound/samples/instruments/11_splash_cymbal.aiff": [0,{"jp":["@sound",137],"us":["@sound",158],"eu":["@sound",158],"sh":["@sound",158]}],
 "sound/samples/instruments/12_snare_drum_1.aiff": [0,{"jp":["@sound",138],"us":["@sound",159],"eu":["@sound",159],"sh":["@sound",159]}],
 "sound/samples/instruments/13_snare_drum_2.aiff": [0,{"jp":["@sound",139],"us":["@sound",160],"eu":["@sound",160],"sh":["@sound",160]}],
-"sound/samples/instruments/14_strings_5.aiff": [0,{"jp":["@sound",140],"us":["@sound",161],"eu":["@sound",161],"sh":["@sound",161]}],
-"sound/samples/instruments/15_strings_4.aiff": [0,{"jp":["@sound",141],"us":["@sound",162],"eu":["@sound",162],"sh":["@sound",162]}],
-"sound/samples/instruments/16_french_horns.aiff": [0,{"jp":["@sound",142],"us":["@sound",163],"eu":["@sound",163],"sh":["@sound",163]}],
-"sound/samples/instruments/17_trumpet.aiff": [0,{"jp":["@sound",143],"us":["@sound",164],"eu":["@sound",164],"sh":["@sound",164]}],
+"sound/samples/instruments/14_strings_Eb2.aiff": [0,{"jp":["@sound",140],"us":["@sound",161],"eu":["@sound",161],"sh":["@sound",161]}],
+"sound/samples/instruments/15_strings_B3.aiff": [0,{"jp":["@sound",141],"us":["@sound",162],"eu":["@sound",162],"sh":["@sound",162]}],
+"sound/samples/instruments/16_french_horns_C3.aiff": [0,{"jp":["@sound",142],"us":["@sound",163],"eu":["@sound",163],"sh":["@sound",163]}],
+"sound/samples/instruments/17_trumpet_C#3.aiff": [0,{"jp":["@sound",143],"us":["@sound",164],"eu":["@sound",164],"sh":["@sound",164]}],
 "sound/samples/instruments/18_timpani.aiff": [0,{"jp":["@sound",144],"us":["@sound",165],"eu":["@sound",165],"sh":["@sound",165]}],
-"sound/samples/instruments/19_brass.aiff": [0,{"jp":["@sound",145],"us":["@sound",166],"eu":["@sound",166],"sh":["@sound",166]}],
-"sound/samples/instruments/1A_slap_bass.aiff": [0,{"jp":["@sound",146],"us":["@sound",167],"eu":["@sound",167],"sh":["@sound",167]}],
-"sound/samples/instruments/1B_organ_2.aiff": [0,{"jp":["@sound",147],"us":["@sound",168],"eu":["@sound",168],"sh":["@sound",168]}],
-"sound/samples/instruments/1C.aiff": [0,{"jp":["@sound",148],"us":["@sound",169],"eu":["@sound",169],"sh":["@sound",169]}],
+"sound/samples/instruments/19_brass_Eb3.aiff": [0,{"jp":["@sound",145],"us":["@sound",166],"eu":["@sound",166],"sh":["@sound",166]}],
+"sound/samples/instruments/1A_slap_bass_G#2.aiff": [0,{"jp":["@sound",146],"us":["@sound",167],"eu":["@sound",167],"sh":["@sound",167]}],
+"sound/samples/instruments/1B_percussive_synth_Eb3.aiff": [0,{"jp":["@sound",147],"us":["@sound",168],"eu":["@sound",168],"sh":["@sound",168]}],
+"sound/samples/instruments/1C_les_paul_guitar_E2.aiff": [0,{"jp":["@sound",148],"us":["@sound",169],"eu":["@sound",169],"sh":["@sound",169]}],
 "sound/samples/instruments/1D.aiff": [0,{"jp":["@sound",149],"us":["@sound",170],"eu":["@sound",170],"sh":["@sound",170]}],
 "sound/samples/instruments/1E_closed_triangle.aiff": [0,{"jp":["@sound",150],"us":["@sound",171],"eu":["@sound",171],"sh":["@sound",171]}],
 "sound/samples/instruments/1F_open_triangle.aiff": [0,{"jp":["@sound",151],"us":["@sound",172],"eu":["@sound",172],"sh":["@sound",172]}],
 "sound/samples/instruments/20_cabasa.aiff": [0,{"jp":["@sound",152],"us":["@sound",173],"eu":["@sound",173],"sh":["@sound",173]}],
-"sound/samples/instruments/21_sine_bass.aiff": [0,{"jp":["@sound",153],"us":["@sound",174],"eu":["@sound",174],"sh":["@sound",174]}],
-"sound/samples/instruments/22_boys_choir.aiff": [0,{"jp":["@sound",154],"us":["@sound",175],"eu":["@sound",175],"sh":["@sound",175]}],
-"sound/samples/instruments/23_strings_1.aiff": [0,{"jp":["@sound",155],"us":["@sound",176],"eu":["@sound",176],"sh":["@sound",176]}],
-"sound/samples/instruments/24_strings_2.aiff": [0,{"jp":["@sound",156],"us":["@sound",177],"eu":["@sound",177],"sh":["@sound",177]}],
-"sound/samples/instruments/25_strings_3.aiff": [0,{"jp":["@sound",157],"us":["@sound",178],"eu":["@sound",178],"sh":["@sound",178]}],
-"sound/samples/instruments/26_crystal_rhodes.aiff": [0,{"jp":["@sound",158],"us":["@sound",179],"eu":["@sound",179],"sh":["@sound",179]}],
-"sound/samples/instruments/27_harpsichord.aiff": [0,{"jp":["@sound",159],"us":["@sound",180],"eu":["@sound",180],"sh":["@sound",180]}],
-"sound/samples/instruments/28_sitar_1.aiff": [0,{"jp":["@sound",160],"us":["@sound",181],"eu":["@sound",181],"sh":["@sound",181]}],
-"sound/samples/instruments/29_orchestra_hit.aiff": [0,{"jp":["@sound",161],"us":["@sound",182],"eu":["@sound",182],"sh":["@sound",182]}],
-"sound/samples/instruments/2A.aiff": [0,{"jp":["@sound",162],"us":["@sound",183],"eu":["@sound",183],"sh":["@sound",183]}],
-"sound/samples/instruments/2B.aiff": [0,{"jp":["@sound",163],"us":["@sound",184],"eu":["@sound",184],"sh":["@sound",184]}],
-"sound/samples/instruments/2C.aiff": [0,{"jp":["@sound",164],"us":["@sound",185],"eu":["@sound",185],"sh":["@sound",185]}],
-"sound/samples/instruments/2D_trombone.aiff": [0,{"jp":["@sound",165],"us":["@sound",186],"eu":["@sound",186],"sh":["@sound",186]}],
-"sound/samples/instruments/2E_accordion.aiff": [0,{"jp":["@sound",166],"us":["@sound",187],"eu":["@sound",187],"sh":["@sound",187]}],
+"sound/samples/instruments/21_sine_bass_Bb2.aiff": [0,{"jp":["@sound",153],"us":["@sound",174],"eu":["@sound",174],"sh":["@sound",174]}],
+"sound/samples/instruments/22_boys_choir_Bb4.aiff": [0,{"jp":["@sound",154],"us":["@sound",175],"eu":["@sound",175],"sh":["@sound",175]}],
+"sound/samples/instruments/23_strings_Eb2.aiff": [0,{"jp":["@sound",155],"us":["@sound",176],"eu":["@sound",176],"sh":["@sound",176]}],
+"sound/samples/instruments/24_strings_G#2.aiff": [0,{"jp":["@sound",156],"us":["@sound",177],"eu":["@sound",177],"sh":["@sound",177]}],
+"sound/samples/instruments/25_strings_F#3.aiff": [0,{"jp":["@sound",157],"us":["@sound",178],"eu":["@sound",178],"sh":["@sound",178]}],
+"sound/samples/instruments/26_crystal_rhodes_C4.aiff": [0,{"jp":["@sound",158],"us":["@sound",179],"eu":["@sound",179],"sh":["@sound",179]}],
+"sound/samples/instruments/27_harpsichord_F3.aiff": [0,{"jp":["@sound",159],"us":["@sound",180],"eu":["@sound",180],"sh":["@sound",180]}],
+"sound/samples/instruments/28_sitar_1_A2.aiff": [0,{"jp":["@sound",160],"us":["@sound",181],"eu":["@sound",181],"sh":["@sound",181]}],
+"sound/samples/instruments/29_orchestra_hit_C3.aiff": [0,{"jp":["@sound",161],"us":["@sound",182],"eu":["@sound",182],"sh":["@sound",182]}],
+"sound/samples/instruments/2A_tabla_riff_1.aiff": [0,{"jp":["@sound",162],"us":["@sound",183],"eu":["@sound",183],"sh":["@sound",183]}],
+"sound/samples/instruments/2B_tabla_riff_2.aiff": [0,{"jp":["@sound",163],"us":["@sound",184],"eu":["@sound",184],"sh":["@sound",184]}],
+"sound/samples/instruments/2C_tabla_riff_3.aiff": [0,{"jp":["@sound",164],"us":["@sound",185],"eu":["@sound",185],"sh":["@sound",185]}],
+"sound/samples/instruments/2D_trombone_Bb2.aiff": [0,{"jp":["@sound",165],"us":["@sound",186],"eu":["@sound",186],"sh":["@sound",186]}],
+"sound/samples/instruments/2E_accordion_C4.aiff": [0,{"jp":["@sound",166],"us":["@sound",187],"eu":["@sound",187],"sh":["@sound",187]}],
 "sound/samples/instruments/2F_sleigh_bells.aiff": [0,{"jp":["@sound",167],"us":["@sound",188],"eu":["@sound",188],"sh":["@sound",188]}],
-"sound/samples/instruments/30_rarefaction-lahna.aiff": [0,{"jp":["@sound",168],"us":["@sound",189],"eu":["@sound",189],"sh":["@sound",189]}],
-"sound/samples/instruments/31_rarefaction-convolution.aiff": [0,{"jp":["@sound",169],"us":["@sound",190],"eu":["@sound",190],"sh":["@sound",190]}],
+"sound/samples/instruments/30_rarefaction-lahna_E4.aiff": [0,{"jp":["@sound",168],"us":["@sound",189],"eu":["@sound",189],"sh":["@sound",189]}],
+"sound/samples/instruments/31_rarefaction-convolution_Eb2.aiff": [0,{"jp":["@sound",169],"us":["@sound",190],"eu":["@sound",190],"sh":["@sound",190]}],
 "sound/samples/instruments/32_metal_rimshot.aiff": [0,{"jp":["@sound",170],"us":["@sound",191],"eu":["@sound",191],"sh":["@sound",191]}],
 "sound/samples/instruments/33_kick_drum_2.aiff": [0,{"jp":["@sound",171],"us":["@sound",192],"eu":["@sound",192],"sh":["@sound",192]}],
-"sound/samples/instruments/34_alto_flute.aiff": [0,{"jp":["@sound",172],"us":["@sound",193],"eu":["@sound",193],"sh":["@sound",193]}],
-"sound/samples/instruments/34b_organ.aiff": [0,{"sh":["@sound",194]}],
-"sound/samples/instruments/34c_organ_lq.aiff": [0,{"sh":["@sound",195]}],
-"sound/samples/instruments/35_gospel_organ.aiff": [0,{"jp":["@sound",173],"us":["@sound",194],"eu":["@sound",194],"sh":["@sound",196]}],
-"sound/samples/instruments/36_sawtooth_synth.aiff": [0,{"jp":["@sound",174],"us":["@sound",195],"eu":["@sound",195],"sh":["@sound",197]}],
-"sound/samples/instruments/37_square_synth.aiff": [0,{"jp":["@sound",175],"us":["@sound",196],"eu":["@sound",196],"sh":["@sound",198]}],
+"sound/samples/instruments/34_alto_flute_A4.aiff": [0,{"jp":["@sound",172],"us":["@sound",193],"eu":["@sound",193],"sh":["@sound",193]}],
+"sound/samples/instruments/34b_organ_C3.aiff": [0,{"sh":["@sound",194]}],
+"sound/samples/instruments/34c_organ_C4.aiff": [0,{"sh":["@sound",195]}],
+"sound/samples/instruments/35_gospel_organ_F4.aiff": [0,{"jp":["@sound",173],"us":["@sound",194],"eu":["@sound",194],"sh":["@sound",196]}],
+"sound/samples/instruments/36_sawtooth_synth_Eb1.aiff": [0,{"jp":["@sound",174],"us":["@sound",195],"eu":["@sound",195],"sh":["@sound",197]}],
+"sound/samples/instruments/37_square_synth_C5.aiff": [0,{"jp":["@sound",175],"us":["@sound",196],"eu":["@sound",196],"sh":["@sound",198]}],
 "sound/samples/instruments/38_electric_kick_drum.aiff": [0,{"jp":["@sound",176],"us":["@sound",197],"eu":["@sound",197],"sh":["@sound",199]}],
-"sound/samples/instruments/39_sitar_2.aiff": [0,{"jp":["@sound",177],"us":["@sound",198],"eu":["@sound",198],"sh":["@sound",200]}],
-"sound/samples/instruments/3A_music_box.aiff": [0,{"jp":["@sound",178],"us":["@sound",199],"eu":["@sound",199],"sh":["@sound",201]}],
-"sound/samples/instruments/3B_banjo_2.aiff": [0,{"jp":["@sound",179],"us":["@sound",200],"eu":["@sound",200],"sh":["@sound",202]}],
-"sound/samples/instruments/3C_acoustic_guitar.aiff": [0,{"jp":["@sound",180],"us":["@sound",201],"eu":["@sound",201],"sh":["@sound",203]}],
-"sound/samples/instruments/3D.aiff": [0,{"jp":["@sound",181],"us":["@sound",202],"eu":["@sound",202],"sh":["@sound",204]}],
-"sound/samples/instruments/3E_monk_choir.aiff": [0,{"jp":["@sound",182],"us":["@sound",203],"eu":["@sound",203],"sh":["@sound",205]}],
-"sound/samples/instruments/3F.aiff": [0,{"jp":["@sound",183],"us":["@sound",204],"eu":["@sound",204],"sh":["@sound",206]}],
-"sound/samples/instruments/40_bell.aiff": [0,{"jp":["@sound",184],"us":["@sound",205],"eu":["@sound",205],"sh":["@sound",207]}],
-"sound/samples/instruments/41_pan_flute.aiff": [0,{"jp":["@sound",185],"us":["@sound",206],"eu":["@sound",206],"sh":["@sound",208]}],
-"sound/samples/instruments/42_vibraphone.aiff": [0,{"jp":["@sound",186],"us":["@sound",207],"eu":["@sound",207],"sh":["@sound",209]}],
-"sound/samples/instruments/43_harmonica.aiff": [0,{"jp":["@sound",187],"us":["@sound",208],"eu":["@sound",208],"sh":["@sound",210]}],
-"sound/samples/instruments/44_grand_piano.aiff": [0,{"jp":["@sound",188],"us":["@sound",209],"eu":["@sound",209],"sh":["@sound",211]}],
-"sound/samples/instruments/45_french_horns_lq.aiff": [0,{"jp":["@sound",189],"us":["@sound",210],"eu":["@sound",210],"sh":["@sound",212]}],
-"sound/samples/instruments/45b_la.aiff": [0,{"sh":["@sound",213]}],
-"sound/samples/instruments/46_pizzicato_strings_1.aiff": [0,{"jp":["@sound",190],"us":["@sound",211],"eu":["@sound",211],"sh":["@sound",214]}],
-"sound/samples/instruments/47_pizzicato_strings_2.aiff": [0,{"jp":["@sound",191],"us":["@sound",212],"eu":["@sound",212],"sh":["@sound",215]}],
-"sound/samples/instruments/48_steel_drum.aiff": [0,{"jp":["@sound",192],"us":["@sound",213],"eu":["@sound",213],"sh":["@sound",216]}],
-"sound/samples/piranha_music_box/00_music_box.aiff": [0,{"jp":["@sound",193],"us":["@sound",214],"eu":["@sound",214]}],
+"sound/samples/instruments/39_sitar_2_C#3.aiff": [0,{"jp":["@sound",177],"us":["@sound",198],"eu":["@sound",198],"sh":["@sound",200]}],
+"sound/samples/instruments/3A_music_box_C5.aiff": [0,{"jp":["@sound",178],"us":["@sound",199],"eu":["@sound",199],"sh":["@sound",201]}],
+"sound/samples/instruments/3B_acoustic_guitar_A1.aiff": [0,{"jp":["@sound",179],"us":["@sound",200],"eu":["@sound",200],"sh":["@sound",202]}],
+"sound/samples/instruments/3C_acoustic_guitar_E3.aiff": [0,{"jp":["@sound",180],"us":["@sound",201],"eu":["@sound",201],"sh":["@sound",203]}],
+"sound/samples/instruments/3D_acoustic_guitar_B6.aiff": [0,{"jp":["@sound",181],"us":["@sound",202],"eu":["@sound",202],"sh":["@sound",204]}],
+"sound/samples/instruments/3E_monk_choir_B2.aiff": [0,{"jp":["@sound",182],"us":["@sound",203],"eu":["@sound",203],"sh":["@sound",205]}],
+"sound/samples/instruments/3F_small_gamelan.aiff": [0,{"jp":["@sound",183],"us":["@sound",204],"eu":["@sound",204],"sh":["@sound",206]}],
+"sound/samples/instruments/40_fu_yin_gong_C4.aiff": [0,{"jp":["@sound",184],"us":["@sound",205],"eu":["@sound",205],"sh":["@sound",207]}],
+"sound/samples/instruments/41_pan_flute_C3.aiff": [0,{"jp":["@sound",185],"us":["@sound",206],"eu":["@sound",206],"sh":["@sound",208]}],
+"sound/samples/instruments/42_vibraphone_F#4.aiff": [0,{"jp":["@sound",186],"us":["@sound",207],"eu":["@sound",207],"sh":["@sound",209]}],
+"sound/samples/instruments/43_harmonica_C4.aiff": [0,{"jp":["@sound",187],"us":["@sound",208],"eu":["@sound",208],"sh":["@sound",210]}],
+"sound/samples/instruments/44_grand_piano_F#5.aiff": [0,{"jp":["@sound",188],"us":["@sound",209],"eu":["@sound",209],"sh":["@sound",211]}],
+"sound/samples/instruments/45_french_horns_C4.aiff": [0,{"jp":["@sound",189],"us":["@sound",210],"eu":["@sound",210],"sh":["@sound",212]}],
+"sound/samples/instruments/45b_la_E3.aiff": [0,{"sh":["@sound",213]}],
+"sound/samples/instruments/46_pizzicato_strings_Bb2.aiff": [0,{"jp":["@sound",190],"us":["@sound",211],"eu":["@sound",211],"sh":["@sound",214]}],
+"sound/samples/instruments/47_pizzicato_strings_Bb3.aiff": [0,{"jp":["@sound",191],"us":["@sound",212],"eu":["@sound",212],"sh":["@sound",215]}],
+"sound/samples/instruments/48_steel_drum_C#3.aiff": [0,{"jp":["@sound",192],"us":["@sound",213],"eu":["@sound",213],"sh":["@sound",216]}],
+"sound/samples/piranha_music_box/00_music_box_C5.aiff": [0,{"jp":["@sound",193],"us":["@sound",214],"eu":["@sound",214]}],
 "sound/samples/sfx_1/00_twirl.aiff": [0,{"jp":["@sound",0],"us":["@sound",0],"eu":["@sound",0],"sh":["@sound",0]}],
 "sound/samples/sfx_1/01_brushing.aiff": [0,{"jp":["@sound",1],"us":["@sound",1],"eu":["@sound",1],"sh":["@sound",1]}],
 "sound/samples/sfx_1/02_hand_touch.aiff": [0,{"jp":["@sound",2],"us":["@sound",2],"eu":["@sound",2],"sh":["@sound",2]}],
diff --git a/sound/sound_banks/0B.json b/sound/sound_banks/0B.json
index 1ec7d90a6f..3004e5f8c2 100644
--- a/sound/sound_banks/0B.json
+++ b/sound/sound_banks/0B.json
@@ -51,29 +51,29 @@
             "normal_range_lo": 29,
             "normal_range_hi": 63,
             "envelope": "envelope0",
-            "sound_lo": "3B_banjo_2",
-            "sound": "3C_acoustic_guitar",
-            "sound_hi": "3D"
+            "sound_lo": "3B_acoustic_guitar_A1",
+            "sound": "3C_acoustic_guitar_E3",
+            "sound_hi": "3D_acoustic_guitar_B6"
         },
         "inst1": {
             "release_rate": 208,
             "envelope": "envelope1",
-            "sound": "2E_accordion"
+            "sound": "2E_accordion_C4"
         },
         "inst2": {
             "release_rate": 208,
             "envelope": "envelope2",
-            "sound": "2E_accordion"
+            "sound": "2E_accordion_C4"
         },
         "inst3": {
             "release_rate": 208,
             "envelope": "envelope3",
-            "sound": "16_french_horns"
+            "sound": "16_french_horns_C3"
         },
         "inst4": {
             "release_rate": 208,
             "envelope": "envelope4",
-            "sound": "16_french_horns"
+            "sound": "16_french_horns_C3"
         },
         "inst5": {
             "release_rate": 10,
diff --git a/sound/sound_banks/0C.json b/sound/sound_banks/0C.json
index 2b35bbe19d..9c2089ac84 100644
--- a/sound/sound_banks/0C.json
+++ b/sound/sound_banks/0C.json
@@ -93,69 +93,69 @@
             "normal_range_lo": 29,
             "normal_range_hi": 63,
             "envelope": "envelope0",
-            "sound_lo": "3B_banjo_2",
-            "sound": "3C_acoustic_guitar",
-            "sound_hi": "3D"
+            "sound_lo": "3B_acoustic_guitar_A1",
+            "sound": "3C_acoustic_guitar_E3",
+            "sound_hi": "3D_acoustic_guitar_B6"
         },
         "inst1": {
             "release_rate": 24,
             "normal_range_lo": 29,
             "normal_range_hi": 61,
             "envelope": "envelope1",
-            "sound_lo": "3B_banjo_2",
-            "sound": "3C_acoustic_guitar",
-            "sound_hi": "3D"
+            "sound_lo": "3B_acoustic_guitar_A1",
+            "sound": "3C_acoustic_guitar_E3",
+            "sound_hi": "3D_acoustic_guitar_B6"
         },
         "inst2": {
             "release_rate": 38,
             "normal_range_lo": 29,
             "normal_range_hi": 61,
             "envelope": "envelope2",
-            "sound_lo": "3B_banjo_2",
-            "sound": "3C_acoustic_guitar",
-            "sound_hi": "3D"
+            "sound_lo": "3B_acoustic_guitar_A1",
+            "sound": "3C_acoustic_guitar_E3",
+            "sound_hi": "3D_acoustic_guitar_B6"
         },
         "inst3": {
             "release_rate": 38,
             "normal_range_lo": 29,
             "normal_range_hi": 61,
             "envelope": "envelope3",
-            "sound_lo": "3B_banjo_2",
-            "sound": "3C_acoustic_guitar",
-            "sound_hi": "3D"
+            "sound_lo": "3B_acoustic_guitar_A1",
+            "sound": "3C_acoustic_guitar_E3",
+            "sound_hi": "3D_acoustic_guitar_B6"
         },
         "inst4": {
             "release_rate": 38,
             "normal_range_lo": 29,
             "normal_range_hi": 61,
             "envelope": "envelope4",
-            "sound_lo": "3B_banjo_2",
-            "sound": "3C_acoustic_guitar",
-            "sound_hi": "3D"
+            "sound_lo": "3B_acoustic_guitar_A1",
+            "sound": "3C_acoustic_guitar_E3",
+            "sound_hi": "3D_acoustic_guitar_B6"
         },
         "inst5": {
             "release_rate": 38,
             "normal_range_lo": 29,
             "normal_range_hi": 61,
             "envelope": "envelope5",
-            "sound_lo": "3B_banjo_2",
-            "sound": "3C_acoustic_guitar",
-            "sound_hi": "3D"
+            "sound_lo": "3B_acoustic_guitar_A1",
+            "sound": "3C_acoustic_guitar_E3",
+            "sound_hi": "3D_acoustic_guitar_B6"
         },
         "inst6": {
             "release_rate": 208,
             "envelope": "envelope6",
-            "sound": "21_sine_bass"
+            "sound": "21_sine_bass_Bb2"
         },
         "inst7": {
             "release_rate": 114,
             "envelope": "envelope7",
-            "sound": "34_alto_flute"
+            "sound": "34_alto_flute_A4"
         },
         "inst8": {
             "release_rate": 208,
             "envelope": "envelope8",
-            "sound": "34_alto_flute"
+            "sound": "34_alto_flute_A4"
         },
         "percussion": [
             {"release_rate": 10, "pan": 62, "envelope": "envelope9", "sound": {"sample": "06_kick_drum_1", "tuning": 0.210224}},
@@ -251,7 +251,7 @@
         "inst12": {
             "release_rate": 10,
             "envelope": "envelope13",
-            "sound": "42_vibraphone"
+            "sound": "42_vibraphone_F#4"
         }
     },
     "instrument_list": [
diff --git a/sound/sound_banks/0D.json b/sound/sound_banks/0D.json
index 6d02f42907..25f9028cb2 100644
--- a/sound/sound_banks/0D.json
+++ b/sound/sound_banks/0D.json
@@ -74,40 +74,40 @@
             "release_rate": 100,
             "normal_range_lo": 41,
             "envelope": "envelope0",
-            "sound_lo": "00",
-            "sound": "01_banjo_1"
+            "sound_lo": "00_banjo_D2",
+            "sound": "01_banjo_A2"
         },
         "inst1": {
             "release_rate": 100,
             "normal_range_lo": 41,
             "envelope": "envelope1",
-            "sound_lo": "00",
-            "sound": "01_banjo_1"
+            "sound_lo": "00_banjo_D2",
+            "sound": "01_banjo_A2"
         },
         "inst2": {
             "release_rate": 180,
             "envelope": "envelope2",
-            "sound": "02"
+            "sound": "02_violin_B2"
         },
         "inst3": {
             "release_rate": 208,
             "envelope": "envelope3",
-            "sound": "02"
+            "sound": "02_violin_B2"
         },
         "inst4": {
             "release_rate": 76,
             "envelope": "envelope4",
-            "sound": "03_human_whistle"
+            "sound": "03_human_whistle_C3"
         },
         "inst5": {
             "release_rate": 53,
             "envelope": "envelope5",
-            "sound": "04_bright_piano"
+            "sound": "04_bright_piano_G#3"
         },
         "inst6": {
             "release_rate": 208,
             "envelope": "envelope6",
-            "sound": "05_acoustic_bass"
+            "sound": "05_acoustic_bass_A1"
         },
         "percussion": [
             {"release_rate": 10, "pan": 62, "envelope": "envelope7", "sound": {"sample": "06_kick_drum_1", "tuning": 0.210224}},
diff --git a/sound/sound_banks/0E.json b/sound/sound_banks/0E.json
index c4404e4746..76f9544fd7 100644
--- a/sound/sound_banks/0E.json
+++ b/sound/sound_banks/0E.json
@@ -51,49 +51,49 @@
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope0",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         },
         "inst1": {
             "release_rate": 15,
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope1",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         },
         "inst2": {
             "release_rate": 15,
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope2",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         },
         "inst3": {
             "release_rate": 43,
             "normal_range_hi": 47,
             "envelope": "envelope3",
-            "sound": "46_pizzicato_strings_1",
-            "sound_hi": "47_pizzicato_strings_2"
+            "sound": "46_pizzicato_strings_Bb2",
+            "sound_hi": "47_pizzicato_strings_Bb3"
         },
         "inst4": {
             "release_rate": 119,
             "envelope": "envelope4",
-            "sound": "2D_trombone"
+            "sound": "2D_trombone_Bb2"
         },
         "inst5": {
             "release_rate": 10,
             "envelope": "envelope5",
-            "sound": "26_crystal_rhodes"
+            "sound": "26_crystal_rhodes_C4"
         },
         "inst6": {
             "release_rate": 10,
             "envelope": "envelope6",
-            "sound": "26_crystal_rhodes"
+            "sound": "26_crystal_rhodes_C4"
         }
     },
     "instrument_list": [
diff --git a/sound/sound_banks/0F.json b/sound/sound_banks/0F.json
index 4924e1962b..e5722fa799 100644
--- a/sound/sound_banks/0F.json
+++ b/sound/sound_banks/0F.json
@@ -33,24 +33,24 @@
             "normal_range_lo": 55,
             "normal_range_hi": 56,
             "envelope": "envelope0",
-            "sound_lo": "2A",
-            "sound": "2B",
-            "sound_hi": "2C"
+            "sound_lo": "2A_tabla_riff_1",
+            "sound": "2B_tabla_riff_2",
+            "sound_hi": "2C_tabla_riff_3"
         },
         "inst1": {
             "release_rate": 10,
             "envelope": "envelope1",
-            "sound": "22_boys_choir"
+            "sound": "22_boys_choir_Bb4"
         },
         "inst2": {
             "release_rate": 90,
             "envelope": "envelope2",
-            "sound": "28_sitar_1"
+            "sound": "28_sitar_1_A2"
         },
         "inst3": {
             "release_rate": 10,
             "envelope": "envelope3",
-            "sound": "39_sitar_2"
+            "sound": "39_sitar_2_C#3"
         }
     },
     "instrument_list": [
diff --git a/sound/sound_banks/10.json b/sound/sound_banks/10.json
index 1edec8361e..99e240cb81 100644
--- a/sound/sound_banks/10.json
+++ b/sound/sound_banks/10.json
@@ -49,32 +49,32 @@
         "inst0": {
             "release_rate": 10,
             "envelope": "envelope0",
-            "sound": "3E_monk_choir"
+            "sound": "3E_monk_choir_B2"
         },
         "inst1": {
             "release_rate": 10,
             "envelope": "envelope1",
-            "sound": "3E_monk_choir"
+            "sound": "3E_monk_choir_B2"
         },
         "inst2": {
             "release_rate": 208,
             "envelope": "envelope2",
-            "sound": "3F"
+            "sound": "3F_small_gamelan"
         },
         "inst3": {
             "release_rate": 10,
             "envelope": "envelope3",
-            "sound": "40_bell"
+            "sound": "40_fu_yin_gong_C4"
         },
         "inst4": {
             "release_rate": 10,
             "envelope": "envelope4",
-            "sound": "40_bell"
+            "sound": "40_fu_yin_gong_C4"
         },
         "inst5": {
             "release_rate": 10,
             "envelope": "envelope5",
-            "sound": "40_bell"
+            "sound": "40_fu_yin_gong_C4"
         },
         "percussion": [
             {"release_rate": 10, "pan": 62, "envelope": "envelope6", "sound": {"sample": "06_kick_drum_1", "tuning": 0.210224}},
diff --git a/sound/sound_banks/11.json b/sound/sound_banks/11.json
index 69dc21c1e4..01d7102374 100644
--- a/sound/sound_banks/11.json
+++ b/sound/sound_banks/11.json
@@ -94,37 +94,37 @@
         "inst1": {
             "release_rate": 208,
             "envelope": "envelope1",
-            "sound": "21_sine_bass"
+            "sound": "21_sine_bass_Bb2"
         },
         "inst2": {
             "release_rate": 208,
             "envelope": "envelope2",
-            "sound": "35_gospel_organ"
+            "sound": "35_gospel_organ_F4"
         },
         "inst3": {
             "release_rate": 10,
             "envelope": "envelope3",
-            "sound": "48_steel_drum"
+            "sound": "48_steel_drum_C#3"
         },
         "inst4": {
             "release_rate": 208,
             "envelope": "envelope4",
-            "sound": "19_brass"
+            "sound": "19_brass_Eb3"
         },
         "inst5": {
             "release_rate": 208,
             "envelope": "envelope5",
-            "sound": "1A_slap_bass"
+            "sound": "1A_slap_bass_G#2"
         },
         "inst6": {
             "release_rate": 128,
             "envelope": "envelope6",
-            "sound": "1B_organ_2"
+            "sound": "1B_percussive_synth_Eb3"
         },
         "inst7": {
             "release_rate": 208,
             "envelope": "envelope7",
-            "sound": "1C"
+            "sound": "1C_les_paul_guitar_E2"
         },
         "percussion": [
             {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 0.210224}},
diff --git a/sound/sound_banks/12.json b/sound/sound_banks/12.json
index 93f34b3421..b6bd1ba949 100644
--- a/sound/sound_banks/12.json
+++ b/sound/sound_banks/12.json
@@ -61,17 +61,17 @@
         "inst0": {
             "release_rate": 10,
             "envelope": "envelope0",
-            "sound": "30_rarefaction-lahna"
+            "sound": "30_rarefaction-lahna_E4"
         },
         "inst1": {
             "release_rate": 208,
             "envelope": "envelope1",
-            "sound": "31_rarefaction-convolution"
+            "sound": "31_rarefaction-convolution_Eb2"
         },
         "inst2": {
             "release_rate": 208,
             "envelope": "envelope2",
-            "sound": "31_rarefaction-convolution"
+            "sound": "31_rarefaction-convolution_Eb2"
         },
         "inst3": {
             "release_rate": 10,
@@ -101,21 +101,21 @@
         "inst6": {
             "release_rate": 208,
             "envelope": "envelope6",
-            "sound": "29_orchestra_hit"
+            "sound": "29_orchestra_hit_C3"
         },
         "inst7": {
             "release_rate": 114,
             "envelope": "envelope7",
-            "sound": "34_alto_flute"
+            "sound": "34_alto_flute_A4"
         },
         "inst8": {
             "release_rate": 15,
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope8",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         }
     },
     "instrument_list": [
diff --git a/sound/sound_banks/13.json b/sound/sound_banks/13.json
index 53da9e97f3..46bf8b3917 100644
--- a/sound/sound_banks/13.json
+++ b/sound/sound_banks/13.json
@@ -57,23 +57,23 @@
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope0",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         },
         "inst1": {
             "release_rate": 15,
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope1",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         },
         "inst2": {
             "release_rate": 208,
             "envelope": "envelope2",
-            "sound": "21_sine_bass"
+            "sound": "21_sine_bass_Bb2"
         },
         "percussion": [
             {"release_rate": 10, "pan": 62, "envelope": "envelope3", "sound": {"sample": "06_kick_drum_1", "tuning": 0.210224}},
@@ -160,12 +160,12 @@
         "inst5": {
             "release_rate": 10,
             "envelope": "envelope6",
-            "sound": "26_crystal_rhodes"
+            "sound": "26_crystal_rhodes_C4"
         },
         "inst6": {
             "release_rate": 10,
             "envelope": "envelope7",
-            "sound": "26_crystal_rhodes"
+            "sound": "26_crystal_rhodes_C4"
         }
     },
     "instrument_list": [
diff --git a/sound/sound_banks/14_piranha_music_box.json b/sound/sound_banks/14_piranha_music_box.json
index 2a92039429..6eb2c13709 100644
--- a/sound/sound_banks/14_piranha_music_box.json
+++ b/sound/sound_banks/14_piranha_music_box.json
@@ -37,27 +37,27 @@
         "inst0": {
             "release_rate": 119,
             "envelope": "envelope0",
-            "sound": {"ifdef": ["VERSION_SH"], "then": "3A_music_box", "else": "00_music_box"}
+            "sound": {"ifdef": ["VERSION_SH"], "then": "3A_music_box_C5", "else": "00_music_box_C5"}
         },
         "inst1": {
             "release_rate": 119,
             "envelope": "envelope1",
-            "sound": {"ifdef": ["VERSION_SH"], "then": "3A_music_box", "else": "00_music_box"}
+            "sound": {"ifdef": ["VERSION_SH"], "then": "3A_music_box_C5", "else": "00_music_box_C5"}
         },
         "inst2": {
             "release_rate": 119,
             "envelope": "envelope2",
-            "sound": {"ifdef": ["VERSION_SH"], "then": "3A_music_box", "else": "00_music_box"}
+            "sound": {"ifdef": ["VERSION_SH"], "then": "3A_music_box_C5", "else": "00_music_box_C5"}
         },
         "inst3": {
             "release_rate": 119,
             "envelope": "envelope3",
-            "sound": {"ifdef": ["VERSION_SH"], "then": "3A_music_box", "else": "00_music_box"}
+            "sound": {"ifdef": ["VERSION_SH"], "then": "3A_music_box_C5", "else": "00_music_box_C5"}
         },
         "inst4": {
             "release_rate": 119,
             "envelope": "envelope4",
-            "sound": {"ifdef": ["VERSION_SH"], "then": "3A_music_box", "else": "00_music_box"}
+            "sound": {"ifdef": ["VERSION_SH"], "then": "3A_music_box_C5", "else": "00_music_box_C5"}
         }
     },
     "instrument_list": [
diff --git a/sound/sound_banks/15.json b/sound/sound_banks/15.json
index c89e2e9447..eb45ef4d75 100644
--- a/sound/sound_banks/15.json
+++ b/sound/sound_banks/15.json
@@ -81,22 +81,22 @@
         "inst2": {
             "release_rate": 10,
             "envelope": "envelope2",
-            "sound": "21_sine_bass"
+            "sound": "21_sine_bass_Bb2"
         },
         "inst3": {
             "release_rate": 208,
             "envelope": "envelope3",
-            "sound": "1A_slap_bass"
+            "sound": "1A_slap_bass_G#2"
         },
         "inst4": {
             "release_rate": 114,
             "envelope": "envelope4",
-            "sound": "21_sine_bass"
+            "sound": "21_sine_bass_Bb2"
         },
         "inst5": {
             "release_rate": 53,
             "envelope": "envelope5",
-            "sound": "04_bright_piano"
+            "sound": "04_bright_piano_G#3"
         },
         "inst6": {
             "release_rate": 208,
@@ -106,12 +106,12 @@
         "inst7": {
             "release_rate": 10,
             "envelope": "envelope7",
-            "sound": "22_boys_choir"
+            "sound": "22_boys_choir_Bb4"
         },
         "inst8": {
             "release_rate": 10,
             "envelope": "envelope8",
-            "sound": "22_boys_choir"
+            "sound": "22_boys_choir_Bb4"
         },
         "percussion": [
             {"release_rate": 10, "pan": 62, "envelope": "envelope9", "sound": {"sample": "06_kick_drum_1", "tuning": 0.210224}},
diff --git a/sound/sound_banks/16_course_start.json b/sound/sound_banks/16_course_start.json
index cd348d2f41..323cead3da 100644
--- a/sound/sound_banks/16_course_start.json
+++ b/sound/sound_banks/16_course_start.json
@@ -19,12 +19,12 @@
         "inst0": {
             "release_rate": 208,
             "envelope": "envelope0",
-            "sound": {"ifdef": ["VERSION_SH"], "then": "45b_la", "else": "00_la"}
+            "sound": {"ifdef": ["VERSION_SH"], "then": "45b_la_E3", "else": "00_la_E3"}
         },
         "inst1": {
             "release_rate": 208,
             "envelope": "envelope1",
-            "sound": {"ifdef": ["VERSION_SH"], "then": "45b_la", "else": "00_la"}
+            "sound": {"ifdef": ["VERSION_SH"], "then": "45b_la_E3", "else": "00_la_E3"}
         }
     },
     "instrument_list": [
diff --git a/sound/sound_banks/17.json b/sound/sound_banks/17.json
index d0fab40484..63563ca245 100644
--- a/sound/sound_banks/17.json
+++ b/sound/sound_banks/17.json
@@ -63,37 +63,37 @@
             "normal_range_lo": 29,
             "normal_range_hi": 63,
             "envelope": "envelope0",
-            "sound_lo": "3B_banjo_2",
-            "sound": "3C_acoustic_guitar",
-            "sound_hi": "3D"
+            "sound_lo": "3B_acoustic_guitar_A1",
+            "sound": "3C_acoustic_guitar_E3",
+            "sound_hi": "3D_acoustic_guitar_B6"
         },
         "inst1": {
             "release_rate": 208,
             "envelope": "envelope1",
-            "sound": "05_acoustic_bass"
+            "sound": "05_acoustic_bass_A1"
         },
         "inst2": {
             "release_rate": 15,
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope2",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         },
         "inst3": {
             "release_rate": 15,
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope3",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         },
         "inst4": {
             "release_rate": 10,
             "envelope": "envelope4",
-            "sound": "26_crystal_rhodes"
+            "sound": "26_crystal_rhodes_C4"
         },
         "percussion": [
             {"release_rate": 10, "pan": 62, "envelope": "envelope5", "sound": {"sample": "06_kick_drum_1", "tuning": 0.210224}},
diff --git a/sound/sound_banks/18.json b/sound/sound_banks/18.json
index 6f09dbb49c..da40131fbb 100644
--- a/sound/sound_banks/18.json
+++ b/sound/sound_banks/18.json
@@ -61,22 +61,22 @@
         "inst0": {
             "release_rate": 208,
             "envelope": "envelope0",
-            "sound": "35_gospel_organ"
+            "sound": "35_gospel_organ_F4"
         },
         "inst1": {
             "release_rate": 208,
             "envelope": "envelope1",
-            "sound": "36_sawtooth_synth"
+            "sound": "36_sawtooth_synth_Eb1"
         },
         "inst2": {
             "release_rate": 208,
             "envelope": "envelope2",
-            "sound": "37_square_synth"
+            "sound": "37_square_synth_C5"
         },
         "inst3": {
             "release_rate": 208,
             "envelope": "envelope3",
-            "sound": "29_orchestra_hit"
+            "sound": "29_orchestra_hit_C3"
         },
         "percussion": [
             {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 0.210224}},
diff --git a/sound/sound_banks/19.json b/sound/sound_banks/19.json
index 1591ea88ac..2d743fd30b 100644
--- a/sound/sound_banks/19.json
+++ b/sound/sound_banks/19.json
@@ -79,50 +79,50 @@
         "inst0": {
             "release_rate": 10,
             "envelope": "envelope0",
-            "sound": "22_boys_choir"
+            "sound": "22_boys_choir_Bb4"
         },
         "inst1": {
             "release_rate": 208,
             "envelope": "envelope1",
-            "sound": "19_brass"
+            "sound": "19_brass_Eb3"
         },
         "inst2": {
             "release_rate": 15,
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope2",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         },
         "inst3": {
             "release_rate": 90,
             "envelope": "envelope3",
-            "sound": "28_sitar_1"
+            "sound": "28_sitar_1_A2"
         },
         "inst4": {
             "release_rate": 208,
             "envelope": "envelope4",
-            "sound": "29_orchestra_hit"
+            "sound": "29_orchestra_hit_C3"
         },
         "inst5": {
             "release_rate": 100,
             "normal_range_lo": 55,
             "normal_range_hi": 56,
             "envelope": "envelope5",
-            "sound_lo": "2A",
-            "sound": "2B",
-            "sound_hi": "2C"
+            "sound_lo": "2A_tabla_riff_1",
+            "sound": "2B_tabla_riff_2",
+            "sound_hi": "2C_tabla_riff_3"
         },
         "inst6": {
             "release_rate": 208,
             "envelope": "envelope6",
-            "sound": "19_brass"
+            "sound": "19_brass_Eb3"
         },
         "inst7": {
             "release_rate": 10,
             "envelope": "envelope7",
-            "sound": "22_boys_choir"
+            "sound": "22_boys_choir_Bb4"
         },
         "percussion": [
             {"release_rate": 10, "pan": 62, "envelope": "envelope8", "sound": {"sample": "06_kick_drum_1", "tuning": 0.210224}},
diff --git a/sound/sound_banks/1A.json b/sound/sound_banks/1A.json
index a648d86a58..1b8c21bc74 100644
--- a/sound/sound_banks/1A.json
+++ b/sound/sound_banks/1A.json
@@ -61,34 +61,34 @@
         "inst0": {
             "release_rate": 67,
             "envelope": "envelope0",
-            "sound": "17_trumpet"
+            "sound": "17_trumpet_C#3"
         },
         "inst1": {
             "release_rate": 119,
             "envelope": "envelope1",
-            "sound": "2D_trombone"
+            "sound": "2D_trombone_Bb2"
         },
         "inst2": {
             "release_rate": 208,
             "envelope": "envelope2",
-            "sound": "16_french_horns"
+            "sound": "16_french_horns_C3"
         },
         "inst3": {
             "release_rate": 24,
             "normal_range_lo": 42,
             "envelope": "envelope3",
-            "sound_lo": "14_strings_5",
-            "sound": "15_strings_4"
+            "sound_lo": "14_strings_Eb2",
+            "sound": "15_strings_B3"
         },
         "inst4": {
             "release_rate": 208,
             "envelope": "envelope4",
-            "sound": "19_brass"
+            "sound": "19_brass_Eb3"
         },
         "inst5": {
             "release_rate": 10,
             "envelope": "envelope5",
-            "sound": "26_crystal_rhodes"
+            "sound": "26_crystal_rhodes_C4"
         },
         "inst6": {
             "release_rate": 10,
diff --git a/sound/sound_banks/1B.json b/sound/sound_banks/1B.json
index 472df84a47..754cac3856 100644
--- a/sound/sound_banks/1B.json
+++ b/sound/sound_banks/1B.json
@@ -62,32 +62,32 @@
             "release_rate": 24,
             "normal_range_lo": 42,
             "envelope": "envelope0",
-            "sound_lo": "14_strings_5",
-            "sound": "15_strings_4"
+            "sound_lo": "14_strings_Eb2",
+            "sound": "15_strings_B3"
         },
         "inst1": {
             "release_rate": 24,
             "normal_range_lo": 42,
             "envelope": "envelope1",
-            "sound_lo": "14_strings_5",
-            "sound": "15_strings_4"
+            "sound_lo": "14_strings_Eb2",
+            "sound": "15_strings_B3"
         },
         "inst2": {
             "release_rate": 208,
             "envelope": "envelope2",
-            "sound": "16_french_horns"
+            "sound": "16_french_horns_C3"
         },
         "inst3": {
             "release_rate": 67,
             "envelope": "envelope3",
-            "sound": "17_trumpet"
+            "sound": "17_trumpet_C#3"
         },
         "inst4": {
             "release_rate": 24,
             "normal_range_lo": 42,
             "envelope": "envelope4",
-            "sound_lo": "14_strings_5",
-            "sound": "15_strings_4"
+            "sound_lo": "14_strings_Eb2",
+            "sound": "15_strings_B3"
         },
         "inst5": {
             "release_rate": 10,
diff --git a/sound/sound_banks/1C_endless_stairs.json b/sound/sound_banks/1C_endless_stairs.json
index 2f4f50584d..fd74be20ba 100644
--- a/sound/sound_banks/1C_endless_stairs.json
+++ b/sound/sound_banks/1C_endless_stairs.json
@@ -43,38 +43,38 @@
         "inst0": {
             "release_rate": 119,
             "envelope": "envelope0",
-            "sound": "3A_music_box"
+            "sound": "3A_music_box_C5"
         },
         "inst1": {
             "release_rate": 119,
             "envelope": "envelope1",
-            "sound": "3A_music_box"
+            "sound": "3A_music_box_C5"
         },
         "inst2": {
             "release_rate": 119,
             "envelope": "envelope2",
-            "sound": "3A_music_box"
+            "sound": "3A_music_box_C5"
         },
         "inst3": {
             "release_rate": 24,
             "normal_range_lo": 42,
             "envelope": "envelope3",
-            "sound_lo": "14_strings_5",
-            "sound": "15_strings_4"
+            "sound_lo": "14_strings_Eb2",
+            "sound": "15_strings_B3"
         },
         "inst4": {
             "release_rate": 24,
             "normal_range_lo": 42,
             "envelope": "envelope4",
-            "sound_lo": "14_strings_5",
-            "sound": "15_strings_4"
+            "sound_lo": "14_strings_Eb2",
+            "sound": "15_strings_B3"
         },
         "inst5": {
             "release_rate": 24,
             "normal_range_lo": 42,
             "envelope": "envelope5",
-            "sound_lo": "14_strings_5",
-            "sound": "15_strings_4"
+            "sound_lo": "14_strings_Eb2",
+            "sound": "15_strings_B3"
         }
     },
     "instrument_list": [
diff --git a/sound/sound_banks/1D_bowser_organ.json b/sound/sound_banks/1D_bowser_organ.json
index 64f26213c5..d82484bcfa 100644
--- a/sound/sound_banks/1D_bowser_organ.json
+++ b/sound/sound_banks/1D_bowser_organ.json
@@ -44,41 +44,41 @@
             "release_rate": 19,
             "normal_range_hi": 50,
             "envelope": "envelope0",
-            "sound": {"ifdef": ["VERSION_SH"], "then": "34b_organ", "else": "00_organ_1"},
-            "sound_hi": {"ifdef": ["VERSION_SH"], "then": "34c_organ_lq", "else": "01_organ_1_lq"}
+            "sound": {"ifdef": ["VERSION_SH"], "then": "34b_organ_C3", "else": "00_organ_C3"},
+            "sound_hi": {"ifdef": ["VERSION_SH"], "then": "34c_organ_C4", "else": "01_organ_C4"}
         },
         "inst1": {
             "release_rate": 19,
             "normal_range_hi": 50,
             "envelope": "envelope1",
-            "sound": {"ifdef": ["VERSION_SH"], "then": "34b_organ", "else": "00_organ_1"},
-            "sound_hi": {"ifdef": ["VERSION_SH"], "then": "34c_organ_lq", "else": "01_organ_1_lq"}
+            "sound": {"ifdef": ["VERSION_SH"], "then": "34b_organ_C3", "else": "00_organ_C3"},
+            "sound_hi": {"ifdef": ["VERSION_SH"], "then": "34c_organ_C4", "else": "01_organ_C4"}
         },
         "inst2": {
             "release_rate": 19,
             "normal_range_hi": 50,
             "envelope": "envelope2",
-            "sound": {"ifdef": ["VERSION_SH"], "then": "34b_organ", "else": "00_organ_1"},
-            "sound_hi": {"ifdef": ["VERSION_SH"], "then": "34c_organ_lq", "else": "01_organ_1_lq"}
+            "sound": {"ifdef": ["VERSION_SH"], "then": "34b_organ_C3", "else": "00_organ_C3"},
+            "sound_hi": {"ifdef": ["VERSION_SH"], "then": "34c_organ_C4", "else": "01_organ_C4"}
         },
         "inst3": {
             "release_rate": 19,
             "normal_range_hi": 50,
             "envelope": "envelope3",
-            "sound": {"ifdef": ["VERSION_SH"], "then": "34b_organ", "else": "00_organ_1"},
-            "sound_hi": {"ifdef": ["VERSION_SH"], "then": "34c_organ_lq", "else": "01_organ_1_lq"}
+            "sound": {"ifdef": ["VERSION_SH"], "then": "34b_organ_C3", "else": "00_organ_C3"},
+            "sound_hi": {"ifdef": ["VERSION_SH"], "then": "34c_organ_C4", "else": "01_organ_C4"}
         },
         "inst4": {
             "release_rate": 19,
             "normal_range_hi": 50,
             "envelope": "envelope4",
-            "sound": {"ifdef": ["VERSION_SH"], "then": "34b_organ", "else": "00_organ_1"},
-            "sound_hi": {"ifdef": ["VERSION_SH"], "then": "34c_organ_lq", "else": "01_organ_1_lq"}
+            "sound": {"ifdef": ["VERSION_SH"], "then": "34b_organ_C3", "else": "00_organ_C3"},
+            "sound_hi": {"ifdef": ["VERSION_SH"], "then": "34c_organ_C4", "else": "01_organ_C4"}
         },
         "inst5": {
             "release_rate": 10,
             "envelope": "envelope5",
-            "sound": {"ifdef": ["VERSION_SH"], "then": "22_boys_choir", "else": "02_boys_choir"}
+            "sound": {"ifdef": ["VERSION_SH"], "then": "22_boys_choir_Bb4", "else": "02_boys_choir_Bb4"}
         }
     },
     "instrument_list": [
diff --git a/sound/sound_banks/1E.json b/sound/sound_banks/1E.json
index 2b4583545a..4cca82c723 100644
--- a/sound/sound_banks/1E.json
+++ b/sound/sound_banks/1E.json
@@ -31,30 +31,30 @@
         "inst0": {
             "release_rate": 255,
             "envelope": "envelope0",
-            "sound": "27_harpsichord"
+            "sound": "27_harpsichord_F3"
         },
         "inst1": {
             "release_rate": 255,
             "envelope": "envelope1",
-            "sound": "27_harpsichord"
+            "sound": "27_harpsichord_F3"
         },
         "inst2": {
             "release_rate": 15,
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope2",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         },
         "inst3": {
             "release_rate": 15,
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope3",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         }
     },
     "instrument_list": [
diff --git a/sound/sound_banks/1F.json b/sound/sound_banks/1F.json
index 66d2697f1e..da585e59af 100644
--- a/sound/sound_banks/1F.json
+++ b/sound/sound_banks/1F.json
@@ -31,12 +31,12 @@
         "inst0": {
             "release_rate": 208,
             "envelope": "envelope0",
-            "sound": "2E_accordion"
+            "sound": "2E_accordion_C4"
         },
         "inst1": {
             "release_rate": 208,
             "envelope": "envelope1",
-            "sound": "2E_accordion"
+            "sound": "2E_accordion_C4"
         },
         "inst2": {
             "release_rate": 208,
diff --git a/sound/sound_banks/20.json b/sound/sound_banks/20.json
index 498a38241e..5e1773a0e1 100644
--- a/sound/sound_banks/20.json
+++ b/sound/sound_banks/20.json
@@ -25,21 +25,21 @@
         "inst0": {
             "release_rate": 208,
             "envelope": "envelope0",
-            "sound": "16_french_horns"
+            "sound": "16_french_horns_C3"
         },
         "inst1": {
             "release_rate": 208,
             "envelope": "envelope1",
-            "sound": "16_french_horns"
+            "sound": "16_french_horns_C3"
         },
         "inst2": {
             "release_rate": 15,
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope2",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         }
     },
     "instrument_list": [
diff --git a/sound/sound_banks/21.json b/sound/sound_banks/21.json
index c33c4e87f5..e14426a2ca 100644
--- a/sound/sound_banks/21.json
+++ b/sound/sound_banks/21.json
@@ -25,17 +25,17 @@
         "inst0": {
             "release_rate": 208,
             "envelope": "envelope0",
-            "sound": "2E_accordion"
+            "sound": "2E_accordion_C4"
         },
         "inst1": {
             "release_rate": 208,
             "envelope": "envelope1",
-            "sound": "2E_accordion"
+            "sound": "2E_accordion_C4"
         },
         "inst2": {
             "release_rate": 10,
             "envelope": "envelope2",
-            "sound": "26_crystal_rhodes"
+            "sound": "26_crystal_rhodes_C4"
         }
     },
     "instrument_list": [
diff --git a/sound/sound_banks/22.json b/sound/sound_banks/22.json
index 3a80b4aaac..7e2ba76863 100644
--- a/sound/sound_banks/22.json
+++ b/sound/sound_banks/22.json
@@ -49,22 +49,22 @@
         "inst0": {
             "release_rate": 208,
             "envelope": "envelope0",
-            "sound": "19_brass"
+            "sound": "19_brass_Eb3"
         },
         "inst1": {
             "release_rate": 208,
             "envelope": "envelope1",
-            "sound": "1A_slap_bass"
+            "sound": "1A_slap_bass_G#2"
         },
         "inst2": {
             "release_rate": 128,
             "envelope": "envelope2",
-            "sound": "1B_organ_2"
+            "sound": "1B_percussive_synth_Eb3"
         },
         "inst3": {
             "release_rate": 208,
             "envelope": "envelope3",
-            "sound": "1C"
+            "sound": "1C_les_paul_guitar_E2"
         },
         "percussion": [
             {"release_rate": 10, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 0.210224}},
diff --git a/sound/sound_banks/23.json b/sound/sound_banks/23.json
index 848d2f799c..46e9ca5093 100644
--- a/sound/sound_banks/23.json
+++ b/sound/sound_banks/23.json
@@ -45,42 +45,42 @@
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope0",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         },
         "inst1": {
             "release_rate": 15,
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope1",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         },
         "inst2": {
             "release_rate": 15,
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope2",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         },
         "inst3": {
             "release_rate": 10,
             "envelope": "envelope3",
-            "sound": "26_crystal_rhodes"
+            "sound": "26_crystal_rhodes_C4"
         },
         "inst4": {
             "release_rate": 10,
             "envelope": "envelope4",
-            "sound": "26_crystal_rhodes"
+            "sound": "26_crystal_rhodes_C4"
         },
         "inst5": {
             "release_rate": 255,
             "envelope": "envelope5",
-            "sound": "27_harpsichord"
+            "sound": "27_harpsichord_F3"
         }
     },
     "instrument_list": [
diff --git a/sound/sound_banks/24.json b/sound/sound_banks/24.json
index d205b00345..828ad6826a 100644
--- a/sound/sound_banks/24.json
+++ b/sound/sound_banks/24.json
@@ -37,19 +37,19 @@
         "inst0": {
             "release_rate": 43,
             "envelope": "envelope0",
-            "sound": "41_pan_flute"
+            "sound": "41_pan_flute_C3"
         },
         "inst1": {
             "release_rate": 24,
             "normal_range_lo": 42,
             "envelope": "envelope1",
-            "sound_lo": "14_strings_5",
-            "sound": "15_strings_4"
+            "sound_lo": "14_strings_Eb2",
+            "sound": "15_strings_B3"
         },
         "inst2": {
             "release_rate": 43,
             "envelope": "envelope3",
-            "sound": "41_pan_flute"
+            "sound": "41_pan_flute_C3"
         },
         "percussion": [
             {"release_rate": 10, "pan": 62, "envelope": "envelope2", "sound": {"sample": "06_kick_drum_1", "tuning": 0.210224}},
@@ -120,7 +120,7 @@
         "inst3": {
             "release_rate": 10,
             "envelope": "envelope4",
-            "sound": "22_boys_choir"
+            "sound": "22_boys_choir_Bb4"
         }
     },
     "instrument_list": [
diff --git a/sound/sound_banks/25.json b/sound/sound_banks/25.json
index 82db2dc8e7..10e1dda7f9 100644
--- a/sound/sound_banks/25.json
+++ b/sound/sound_banks/25.json
@@ -97,34 +97,34 @@
         "inst0": {
             "release_rate": 19,
             "envelope": "envelope0",
-            "sound": "43_harmonica"
+            "sound": "43_harmonica_C4"
         },
         "inst1": {
             "release_rate": 208,
             "envelope": "envelope1",
-            "sound": "1A_slap_bass"
+            "sound": "1A_slap_bass_G#2"
         },
         "inst2": {
             "release_rate": 208,
             "envelope": "envelope2",
-            "sound": "1C"
+            "sound": "1C_les_paul_guitar_E2"
         },
         "inst3": {
             "release_rate": 10,
             "envelope": "envelope3",
-            "sound": "26_crystal_rhodes"
+            "sound": "26_crystal_rhodes_C4"
         },
         "inst4": {
             "release_rate": 34,
             "envelope": "envelope4",
-            "sound": "44_grand_piano"
+            "sound": "44_grand_piano_F#5"
         },
         "inst5": {
             "release_rate": 53,
             "normal_range_hi": 50,
             "envelope": "envelope5",
-            "sound": "16_french_horns",
-            "sound_hi": "45_french_horns_lq"
+            "sound": "16_french_horns_C3",
+            "sound_hi": "45_french_horns_C4"
         },
         "inst6": {
             "release_rate": 10,
@@ -154,31 +154,31 @@
         "inst9": {
             "release_rate": 43,
             "envelope": "envelope9",
-            "sound": "41_pan_flute"
+            "sound": "41_pan_flute_C3"
         },
         "inst10": {
             "release_rate": 15,
             "normal_range_lo": 27,
             "normal_range_hi": 46,
             "envelope": "envelope10",
-            "sound_lo": "23_strings_1",
-            "sound": "24_strings_2",
-            "sound_hi": "25_strings_3"
+            "sound_lo": "23_strings_Eb2",
+            "sound": "24_strings_G#2",
+            "sound_hi": "25_strings_F#3"
         },
         "inst11": {
             "release_rate": 10,
             "envelope": "envelope12",
-            "sound": "44_grand_piano"
+            "sound": "44_grand_piano_F#5"
         },
         "inst12": {
             "release_rate": 10,
             "envelope": "envelope13",
-            "sound": "26_crystal_rhodes"
+            "sound": "26_crystal_rhodes_C4"
         },
         "inst13": {
             "release_rate": 34,
             "envelope": "envelope14",
-            "sound": "43_harmonica"
+            "sound": "43_harmonica_C4"
         },
         "percussion": [
             {"release_rate": 10, "pan": 62, "envelope": "envelope11", "sound": {"sample": "06_kick_drum_1", "tuning": 0.210224}},