diff --git a/osu.Game.Resources/Samples/UI/generic-hover-songselect.wav b/osu.Game.Resources/Samples/UI/default-hover.wav
similarity index 100%
rename from osu.Game.Resources/Samples/UI/generic-hover-songselect.wav
rename to osu.Game.Resources/Samples/UI/default-hover.wav
diff --git a/osu.Game.Resources/Samples/UI/generic-select.wav b/osu.Game.Resources/Samples/UI/default-select.wav
similarity index 100%
rename from osu.Game.Resources/Samples/UI/generic-select.wav
rename to osu.Game.Resources/Samples/UI/default-select.wav
diff --git a/osu.Game.Resources/Samples/UI/generic-hover-noclick.wav b/osu.Game.Resources/Samples/UI/noclick-hover.wav
similarity index 100%
rename from osu.Game.Resources/Samples/UI/generic-hover-noclick.wav
rename to osu.Game.Resources/Samples/UI/noclick-hover.wav
diff --git a/osu.Game.Resources/Samples/UI/generic-select-noclick.wav b/osu.Game.Resources/Samples/UI/noclick-select.wav
similarity index 100%
rename from osu.Game.Resources/Samples/UI/generic-select-noclick.wav
rename to osu.Game.Resources/Samples/UI/noclick-select.wav
diff --git a/osu.Game.Resources/Samples/UI/generic-hover-soft.wav b/osu.Game.Resources/Samples/UI/soft-hover.wav
similarity index 100%
rename from osu.Game.Resources/Samples/UI/generic-hover-soft.wav
rename to osu.Game.Resources/Samples/UI/soft-hover.wav
diff --git a/osu.Game.Resources/Samples/UI/generic-hover-softer.wav b/osu.Game.Resources/Samples/UI/soft-hoverer.wav
similarity index 100%
rename from osu.Game.Resources/Samples/UI/generic-hover-softer.wav
rename to osu.Game.Resources/Samples/UI/soft-hoverer.wav
diff --git a/osu.Game.Resources/Samples/UI/generic-select-soft.wav b/osu.Game.Resources/Samples/UI/soft-select.wav
similarity index 100%
rename from osu.Game.Resources/Samples/UI/generic-select-soft.wav
rename to osu.Game.Resources/Samples/UI/soft-select.wav
diff --git a/osu.Game.Resources/Samples/UI/generic-select-softer.wav b/osu.Game.Resources/Samples/UI/softer-select.wav
similarity index 100%
rename from osu.Game.Resources/Samples/UI/generic-select-softer.wav
rename to osu.Game.Resources/Samples/UI/softer-select.wav
diff --git a/osu.Game.Resources/Samples/UI/generic-hover-toolbar.wav b/osu.Game.Resources/Samples/UI/songselect-hover.wav
similarity index 100%
rename from osu.Game.Resources/Samples/UI/generic-hover-toolbar.wav
rename to osu.Game.Resources/Samples/UI/songselect-hover.wav
diff --git a/osu.Game.Resources/Samples/UI/generic-select-songselect.wav b/osu.Game.Resources/Samples/UI/songselect-select.wav
similarity index 100%
rename from osu.Game.Resources/Samples/UI/generic-select-songselect.wav
rename to osu.Game.Resources/Samples/UI/songselect-select.wav
diff --git a/osu.Game.Resources/Samples/UI/generic-hover.wav b/osu.Game.Resources/Samples/UI/toolbar-hover.wav
similarity index 100%
rename from osu.Game.Resources/Samples/UI/generic-hover.wav
rename to osu.Game.Resources/Samples/UI/toolbar-hover.wav
diff --git a/osu.Game.Resources/Samples/UI/generic-select-toolbar.wav b/osu.Game.Resources/Samples/UI/toolbar-select.wav
similarity index 100%
rename from osu.Game.Resources/Samples/UI/generic-select-toolbar.wav
rename to osu.Game.Resources/Samples/UI/toolbar-select.wav