diff --git a/code/modules/instruments/instrument_data/hardcoded.dm b/code/modules/instruments/instrument_data/hardcoded.dm
index c770f9569e3..28423d88b86 100644
--- a/code/modules/instruments/instrument_data/hardcoded.dm
+++ b/code/modules/instruments/instrument_data/hardcoded.dm
@@ -23,7 +23,7 @@
 	name = "Electric Guitar"
 	id = "eguitar"
 	legacy_instrument_ext = "ogg"
-	legacy_instrument_path = "eguitar"
+	legacy_instrument_path = "electric_guitar"
 
 /datum/instrument/hardcoded/glockenspiel
 	name = "Glockenspiel"
diff --git a/sound/runtime/instruments/eguitar/ab4.ogg b/sound/runtime/instruments/electric_guitar/Ab4.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/ab4.ogg
rename to sound/runtime/instruments/electric_guitar/Ab4.ogg
diff --git a/sound/runtime/instruments/eguitar/ab5.ogg b/sound/runtime/instruments/electric_guitar/Ab5.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/ab5.ogg
rename to sound/runtime/instruments/electric_guitar/Ab5.ogg
diff --git a/sound/runtime/instruments/eguitar/ab6.ogg b/sound/runtime/instruments/electric_guitar/Ab6.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/ab6.ogg
rename to sound/runtime/instruments/electric_guitar/Ab6.ogg
diff --git a/sound/runtime/instruments/eguitar/an4.ogg b/sound/runtime/instruments/electric_guitar/An4.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/an4.ogg
rename to sound/runtime/instruments/electric_guitar/An4.ogg
diff --git a/sound/runtime/instruments/eguitar/an5.ogg b/sound/runtime/instruments/electric_guitar/An5.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/an5.ogg
rename to sound/runtime/instruments/electric_guitar/An5.ogg
diff --git a/sound/runtime/instruments/eguitar/an6.ogg b/sound/runtime/instruments/electric_guitar/An6.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/an6.ogg
rename to sound/runtime/instruments/electric_guitar/An6.ogg
diff --git a/sound/runtime/instruments/eguitar/bb4.ogg b/sound/runtime/instruments/electric_guitar/Bb4.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/bb4.ogg
rename to sound/runtime/instruments/electric_guitar/Bb4.ogg
diff --git a/sound/runtime/instruments/eguitar/bb5.ogg b/sound/runtime/instruments/electric_guitar/Bb5.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/bb5.ogg
rename to sound/runtime/instruments/electric_guitar/Bb5.ogg
diff --git a/sound/runtime/instruments/eguitar/bb6.ogg b/sound/runtime/instruments/electric_guitar/Bb6.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/bb6.ogg
rename to sound/runtime/instruments/electric_guitar/Bb6.ogg
diff --git a/sound/runtime/instruments/eguitar/bn4.ogg b/sound/runtime/instruments/electric_guitar/Bn4.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/bn4.ogg
rename to sound/runtime/instruments/electric_guitar/Bn4.ogg
diff --git a/sound/runtime/instruments/eguitar/bn5.ogg b/sound/runtime/instruments/electric_guitar/Bn5.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/bn5.ogg
rename to sound/runtime/instruments/electric_guitar/Bn5.ogg
diff --git a/sound/runtime/instruments/eguitar/bn6.ogg b/sound/runtime/instruments/electric_guitar/Bn6.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/bn6.ogg
rename to sound/runtime/instruments/electric_guitar/Bn6.ogg
diff --git a/sound/runtime/instruments/eguitar/cn4.ogg b/sound/runtime/instruments/electric_guitar/Cn4.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/cn4.ogg
rename to sound/runtime/instruments/electric_guitar/Cn4.ogg
diff --git a/sound/runtime/instruments/eguitar/cn5.ogg b/sound/runtime/instruments/electric_guitar/Cn5.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/cn5.ogg
rename to sound/runtime/instruments/electric_guitar/Cn5.ogg
diff --git a/sound/runtime/instruments/eguitar/cn6.ogg b/sound/runtime/instruments/electric_guitar/Cn6.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/cn6.ogg
rename to sound/runtime/instruments/electric_guitar/Cn6.ogg
diff --git a/sound/runtime/instruments/eguitar/cn7.ogg b/sound/runtime/instruments/electric_guitar/Cn7.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/cn7.ogg
rename to sound/runtime/instruments/electric_guitar/Cn7.ogg
diff --git a/sound/runtime/instruments/eguitar/db4.ogg b/sound/runtime/instruments/electric_guitar/Db4.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/db4.ogg
rename to sound/runtime/instruments/electric_guitar/Db4.ogg
diff --git a/sound/runtime/instruments/eguitar/db5.ogg b/sound/runtime/instruments/electric_guitar/Db5.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/db5.ogg
rename to sound/runtime/instruments/electric_guitar/Db5.ogg
diff --git a/sound/runtime/instruments/eguitar/db6.ogg b/sound/runtime/instruments/electric_guitar/Db6.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/db6.ogg
rename to sound/runtime/instruments/electric_guitar/Db6.ogg
diff --git a/sound/runtime/instruments/eguitar/dn4.ogg b/sound/runtime/instruments/electric_guitar/Dn4.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/dn4.ogg
rename to sound/runtime/instruments/electric_guitar/Dn4.ogg
diff --git a/sound/runtime/instruments/eguitar/dn5.ogg b/sound/runtime/instruments/electric_guitar/Dn5.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/dn5.ogg
rename to sound/runtime/instruments/electric_guitar/Dn5.ogg
diff --git a/sound/runtime/instruments/eguitar/dn6.ogg b/sound/runtime/instruments/electric_guitar/Dn6.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/dn6.ogg
rename to sound/runtime/instruments/electric_guitar/Dn6.ogg
diff --git a/sound/runtime/instruments/eguitar/eb4.ogg b/sound/runtime/instruments/electric_guitar/Eb4.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/eb4.ogg
rename to sound/runtime/instruments/electric_guitar/Eb4.ogg
diff --git a/sound/runtime/instruments/eguitar/eb5.ogg b/sound/runtime/instruments/electric_guitar/Eb5.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/eb5.ogg
rename to sound/runtime/instruments/electric_guitar/Eb5.ogg
diff --git a/sound/runtime/instruments/eguitar/eb6.ogg b/sound/runtime/instruments/electric_guitar/Eb6.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/eb6.ogg
rename to sound/runtime/instruments/electric_guitar/Eb6.ogg
diff --git a/sound/runtime/instruments/eguitar/en4.ogg b/sound/runtime/instruments/electric_guitar/En4.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/en4.ogg
rename to sound/runtime/instruments/electric_guitar/En4.ogg
diff --git a/sound/runtime/instruments/eguitar/en5.ogg b/sound/runtime/instruments/electric_guitar/En5.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/en5.ogg
rename to sound/runtime/instruments/electric_guitar/En5.ogg
diff --git a/sound/runtime/instruments/eguitar/en6.ogg b/sound/runtime/instruments/electric_guitar/En6.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/en6.ogg
rename to sound/runtime/instruments/electric_guitar/En6.ogg
diff --git a/sound/runtime/instruments/eguitar/fn4.ogg b/sound/runtime/instruments/electric_guitar/Fn4.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/fn4.ogg
rename to sound/runtime/instruments/electric_guitar/Fn4.ogg
diff --git a/sound/runtime/instruments/eguitar/fn5.ogg b/sound/runtime/instruments/electric_guitar/Fn5.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/fn5.ogg
rename to sound/runtime/instruments/electric_guitar/Fn5.ogg
diff --git a/sound/runtime/instruments/eguitar/fn6.ogg b/sound/runtime/instruments/electric_guitar/Fn6.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/fn6.ogg
rename to sound/runtime/instruments/electric_guitar/Fn6.ogg
diff --git a/sound/runtime/instruments/eguitar/gb4.ogg b/sound/runtime/instruments/electric_guitar/Gb4.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/gb4.ogg
rename to sound/runtime/instruments/electric_guitar/Gb4.ogg
diff --git a/sound/runtime/instruments/eguitar/gb5.ogg b/sound/runtime/instruments/electric_guitar/Gb5.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/gb5.ogg
rename to sound/runtime/instruments/electric_guitar/Gb5.ogg
diff --git a/sound/runtime/instruments/eguitar/gb6.ogg b/sound/runtime/instruments/electric_guitar/Gb6.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/gb6.ogg
rename to sound/runtime/instruments/electric_guitar/Gb6.ogg
diff --git a/sound/runtime/instruments/eguitar/gn4.ogg b/sound/runtime/instruments/electric_guitar/Gn4.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/gn4.ogg
rename to sound/runtime/instruments/electric_guitar/Gn4.ogg
diff --git a/sound/runtime/instruments/eguitar/gn5.ogg b/sound/runtime/instruments/electric_guitar/Gn5.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/gn5.ogg
rename to sound/runtime/instruments/electric_guitar/Gn5.ogg
diff --git a/sound/runtime/instruments/eguitar/gn6.ogg b/sound/runtime/instruments/electric_guitar/Gn6.ogg
similarity index 100%
rename from sound/runtime/instruments/eguitar/gn6.ogg
rename to sound/runtime/instruments/electric_guitar/Gn6.ogg