diff --git a/sound/usb/Makefile b/sound/usb/Makefile
index 744024a0a9fc169143d2b0168717354c2f847141..e7ac7f493a8fa1d0874ca9992ee180679390ec69 100644
--- a/sound/usb/Makefile
+++ b/sound/usb/Makefile
@@ -3,7 +3,7 @@
 #
 
 snd-usb-audio-objs := 	card.o \
-			usbmixer.o \
+			mixer.o \
 			mixer_quirks.o \
 			proc.o \
 			quirks.o \
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 78d12ff00e8aa640449f4a5f2a38a5634ac94326..0bd62a1aa4f2f3f1a43179713c17edd2e76cb5cc 100644
--- a/sound/usb/card.c
+++ b/sound/usb/card.c
@@ -56,7 +56,7 @@
 #include "usbaudio.h"
 #include "card.h"
 #include "midi.h"
-#include "usbmixer.h"
+#include "mixer.h"
 #include "proc.h"
 #include "quirks.h"
 #include "endpoint.h"
diff --git a/sound/usb/usbmixer.c b/sound/usb/mixer.c
similarity index 99%
rename from sound/usb/usbmixer.c
rename to sound/usb/mixer.c
index ec2436e953211fd7e3b1e0ad9f5961413d7a0eab..4e7c2fd9e3b42dcdab41a6b0645fac6aaf1ebec2 100644
--- a/sound/usb/usbmixer.c
+++ b/sound/usb/mixer.c
@@ -41,7 +41,7 @@
 #include <sound/tlv.h>
 
 #include "usbaudio.h"
-#include "usbmixer.h"
+#include "mixer.h"
 #include "helper.h"
 #include "mixer_quirks.h"
 
@@ -132,7 +132,7 @@ enum {
  * if the mixer topology is too complicated and the parsed names are
  * ambiguous, add the entries in usbmixer_maps.c.
  */
-#include "usbmixer_maps.c"
+#include "mixer_maps.c"
 
 static const struct usbmix_name_map *
 find_map(struct mixer_build *state, int unitid, int control)
diff --git a/sound/usb/usbmixer.h b/sound/usb/mixer.h
similarity index 100%
rename from sound/usb/usbmixer.h
rename to sound/usb/mixer.h
diff --git a/sound/usb/usbmixer_maps.c b/sound/usb/mixer_maps.c
similarity index 100%
rename from sound/usb/usbmixer_maps.c
rename to sound/usb/mixer_maps.c
diff --git a/sound/usb/mixer_quirks.c b/sound/usb/mixer_quirks.c
index d2f4dcdf59e3b8cc5443827bb3466013e4925ec1..56b665938b1b500f153ce5a7e6589c028993d3d2 100644
--- a/sound/usb/mixer_quirks.c
+++ b/sound/usb/mixer_quirks.c
@@ -35,7 +35,7 @@
 #include <sound/info.h>
 
 #include "usbaudio.h"
-#include "usbmixer.h"
+#include "mixer.h"
 #include "mixer_quirks.h"
 #include "helper.h"
 
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index a82cfeda21f0099d2f460525170d96d23db67f75..d4ced64e465bb86a73a7f5c73c8a5eb68271750e 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -24,7 +24,7 @@
 
 #include "usbaudio.h"
 #include "card.h"
-#include "usbmixer.h"
+#include "mixer.h"
 #include "mixer_quirks.h"
 #include "midi.h"
 #include "quirks.h"