16 files changed, 15 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am
index 5394e7932..24035b458 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -434,7 +434,7 @@ DECODER_SRC = \
 	src/decoder_list.c
 
 if HAVE_MAD
-DECODER_SRC += src/decoder/mad_plugin.c
+DECODER_SRC += src/decoder/mad_decoder_plugin.c
 endif
 
 if HAVE_MPG123
@@ -442,19 +442,19 @@ DECODER_SRC += src/decoder/mpg123_decoder_plugin.c
 endif
 
 if HAVE_MPCDEC
-DECODER_SRC += src/decoder/mpcdec_plugin.c
+DECODER_SRC += src/decoder/mpcdec_decoder_plugin.c
 endif
 
 if HAVE_WAVPACK
-DECODER_SRC += src/decoder/wavpack_plugin.c
+DECODER_SRC += src/decoder/wavpack_decoder_plugin.c
 endif
 
 if HAVE_FAAD
-DECODER_SRC += src/decoder/faad_plugin.c
+DECODER_SRC += src/decoder/faad_decoder_plugin.c
 endif
 
 if HAVE_MP4
-DECODER_SRC += src/decoder/mp4ff_plugin.c
+DECODER_SRC += src/decoder/mp4ff_decoder_plugin.c
 endif
 
 if HAVE_OGG_COMMON
@@ -469,43 +469,43 @@ DECODER_SRC += \
 endif
 
 if ENABLE_VORBIS_DECODER
-DECODER_SRC += src/decoder/vorbis_plugin.c
+DECODER_SRC += src/decoder/vorbis_decoder_plugin.c
 endif
 
 if HAVE_FLAC
-DECODER_SRC += src/decoder/flac_plugin.c
+DECODER_SRC += src/decoder/flac_decoder_plugin.c
 endif
 
 if HAVE_OGGFLAC
-DECODER_SRC += src/decoder/oggflac_plugin.c
+DECODER_SRC += src/decoder/oggflac_decoder_plugin.c
 endif
 
 if HAVE_AUDIOFILE
-DECODER_SRC += src/decoder/audiofile_plugin.c
+DECODER_SRC += src/decoder/audiofile_decoder_plugin.c
 endif
 
 if ENABLE_MIKMOD_DECODER
-DECODER_SRC += src/decoder/mikmod_plugin.c
+DECODER_SRC += src/decoder/mikmod_decoder_plugin.c
 endif
 
 if HAVE_MODPLUG
-DECODER_SRC += src/decoder/modplug_plugin.c
+DECODER_SRC += src/decoder/modplug_decoder_plugin.c
 endif
 
 if ENABLE_SIDPLAY
-DECODER_SRC += src/decoder/sidplay_plugin.cxx
+DECODER_SRC += src/decoder/sidplay_decoder_plugin.cxx
 endif
 
 if ENABLE_FLUIDSYNTH
-DECODER_SRC += src/decoder/fluidsynth_plugin.c
+DECODER_SRC += src/decoder/fluidsynth_decoder_plugin.c
 endif
 
 if ENABLE_WILDMIDI
-DECODER_SRC += src/decoder/wildmidi_plugin.c
+DECODER_SRC += src/decoder/wildmidi_decoder_plugin.c
 endif
 
 if HAVE_FFMPEG
-DECODER_SRC += src/decoder/ffmpeg_plugin.c
+DECODER_SRC += src/decoder/ffmpeg_decoder_plugin.c
 endif
 
 if ENABLE_SNDFILE
diff --git a/src/decoder/audiofile_plugin.c b/src/decoder/audiofile_decoder_plugin.c
index 3026f3cc7..3026f3cc7 100644
--- a/src/decoder/audiofile_plugin.c
+++ b/src/decoder/audiofile_decoder_plugin.c
diff --git a/src/decoder/faad_plugin.c b/src/decoder/faad_decoder_plugin.c
index 8f932ad58..8f932ad58 100644
--- a/src/decoder/faad_plugin.c
+++ b/src/decoder/faad_decoder_plugin.c
diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index 99fbc2108..99fbc2108 100644
--- a/src/decoder/ffmpeg_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
diff --git a/src/decoder/flac_plugin.c b/src/decoder/flac_decoder_plugin.c
index df5778e03..df5778e03 100644
--- a/src/decoder/flac_plugin.c
+++ b/src/decoder/flac_decoder_plugin.c
diff --git a/src/decoder/fluidsynth_plugin.c b/src/decoder/fluidsynth_decoder_plugin.c
index b9a2d0d99..b9a2d0d99 100644
--- a/src/decoder/fluidsynth_plugin.c
+++ b/src/decoder/fluidsynth_decoder_plugin.c
diff --git a/src/decoder/mad_plugin.c b/src/decoder/mad_decoder_plugin.c
index 87dfbeabd..87dfbeabd 100644
--- a/src/decoder/mad_plugin.c
+++ b/src/decoder/mad_decoder_plugin.c
diff --git a/src/decoder/mikmod_plugin.c b/src/decoder/mikmod_decoder_plugin.c
index 69212da59..69212da59 100644
--- a/src/decoder/mikmod_plugin.c
+++ b/src/decoder/mikmod_decoder_plugin.c
diff --git a/src/decoder/modplug_plugin.c b/src/decoder/modplug_decoder_plugin.c
index 037c2fd74..037c2fd74 100644
--- a/src/decoder/modplug_plugin.c
+++ b/src/decoder/modplug_decoder_plugin.c
diff --git a/src/decoder/mp4ff_plugin.c b/src/decoder/mp4ff_decoder_plugin.c
index 74fa13339..74fa13339 100644
--- a/src/decoder/mp4ff_plugin.c
+++ b/src/decoder/mp4ff_decoder_plugin.c
diff --git a/src/decoder/mpcdec_plugin.c b/src/decoder/mpcdec_decoder_plugin.c
index 92f0cad84..92f0cad84 100644
--- a/src/decoder/mpcdec_plugin.c
+++ b/src/decoder/mpcdec_decoder_plugin.c
diff --git a/src/decoder/oggflac_plugin.c b/src/decoder/oggflac_decoder_plugin.c
index 502448a12..502448a12 100644
--- a/src/decoder/oggflac_plugin.c
+++ b/src/decoder/oggflac_decoder_plugin.c
diff --git a/src/decoder/sidplay_plugin.cxx b/src/decoder/sidplay_decoder_plugin.cxx
index a2eb21ae4..a2eb21ae4 100644
--- a/src/decoder/sidplay_plugin.cxx
+++ b/src/decoder/sidplay_decoder_plugin.cxx
diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_decoder_plugin.c
index 12a6623b2..12a6623b2 100644
--- a/src/decoder/vorbis_plugin.c
+++ b/src/decoder/vorbis_decoder_plugin.c
diff --git a/src/decoder/wavpack_plugin.c b/src/decoder/wavpack_decoder_plugin.c
index 380985f85..380985f85 100644
--- a/src/decoder/wavpack_plugin.c
+++ b/src/decoder/wavpack_decoder_plugin.c
diff --git a/src/decoder/wildmidi_plugin.c b/src/decoder/wildmidi_decoder_plugin.c
index 60696fb1a..60696fb1a 100644
--- a/src/decoder/wildmidi_plugin.c
+++ b/src/decoder/wildmidi_decoder_plugin.c