8 files changed, 11 insertions, 11 deletions
diff --git a/src/output/alsa_output_plugin.c b/src/output/alsa_output_plugin.c
index 380c3b359..fb0498e96 100644
--- a/src/output/alsa_output_plugin.c
+++ b/src/output/alsa_output_plugin.c
@@ -669,7 +669,7 @@ alsa_play(void *data, const void *chunk, size_t size, GError **error)
 	}
 }
 
-const struct audio_output_plugin alsaPlugin = {
+const struct audio_output_plugin alsa_output_plugin = {
 	.name = "alsa",
 	.test_default_device = alsa_test_default_device,
 	.init = alsa_init,
diff --git a/src/output/alsa_output_plugin.h b/src/output/alsa_output_plugin.h
index 304ce4012..daa1f3615 100644
--- a/src/output/alsa_output_plugin.h
+++ b/src/output/alsa_output_plugin.h
@@ -20,6 +20,6 @@
 #ifndef MPD_ALSA_OUTPUT_PLUGIN_H
 #define MPD_ALSA_OUTPUT_PLUGIN_H
 
-extern const struct audio_output_plugin alsaPlugin;
+extern const struct audio_output_plugin alsa_output_plugin;
 
 #endif
diff --git a/src/output/osx_output_plugin.c b/src/output/osx_output_plugin.c
index 0d9a2b147..f33148c25 100644
--- a/src/output/osx_output_plugin.c
+++ b/src/output/osx_output_plugin.c
@@ -418,7 +418,7 @@ osx_output_play(void *data, const void *chunk, size_t size,
 	return nbytes;
 }
 
-const struct audio_output_plugin osxPlugin = {
+const struct audio_output_plugin osx_output_plugin = {
 	.name = "osx",
 	.test_default_device = osx_output_test_default_device,
 	.init = osx_output_init,
diff --git a/src/output/raop_output_plugin.c b/src/output/raop_output_plugin.c
index 5224f7257..772112e51 100644
--- a/src/output/raop_output_plugin.c
+++ b/src/output/raop_output_plugin.c
@@ -1031,7 +1031,7 @@ raop_output_play(void *data, const void *chunk, size_t size,
 	return rval;
 }
 
-const struct audio_output_plugin raopPlugin = {
+const struct audio_output_plugin raop_output_plugin = {
 	.name = "raop",
 	.init = raop_output_init,
 	.finish = raop_output_finish,
diff --git a/src/output/raop_output_plugin.h b/src/output/raop_output_plugin.h
index d533f9fad..6aca97836 100644
--- a/src/output/raop_output_plugin.h
+++ b/src/output/raop_output_plugin.h
@@ -26,7 +26,7 @@
 
 struct raop_data;
 
-extern const struct audio_output_plugin raopPlugin;
+extern const struct audio_output_plugin raop_output_plugin;
 
 bool
 raop_set_volume(struct raop_data *rd, unsigned volume, GError **error_r);
diff --git a/src/output/shout_output_plugin.c b/src/output/shout_output_plugin.c
index dcc224e72..299f5b24d 100644
--- a/src/output/shout_output_plugin.c
+++ b/src/output/shout_output_plugin.c
@@ -551,7 +551,7 @@ static void my_shout_set_tag(void *data,
 	write_page(sd, NULL);
 }
 
-const struct audio_output_plugin shoutPlugin = {
+const struct audio_output_plugin shout_output_plugin = {
 	.name = "shout",
 	.init = my_shout_init_driver,
 	.finish = my_shout_finish_driver,
diff --git a/src/output/shout_output_plugin.h b/src/output/shout_output_plugin.h
index 245ecd1c5..9a7378803 100644
--- a/src/output/shout_output_plugin.h
+++ b/src/output/shout_output_plugin.h
@@ -20,6 +20,6 @@
 #ifndef MPD_SHOUT_OUTPUT_PLUGIN_H
 #define MPD_SHOUT_OUTPUT_PLUGIN_H
 
-extern const struct audio_output_plugin shoutPlugin;
+extern const struct audio_output_plugin shout_output_plugin;
 
 #endif
diff --git a/src/output_list.c b/src/output_list.c
index 32a3f6706..6bb9b2f8b 100644
--- a/src/output_list.c
+++ b/src/output_list.c
@@ -42,7 +42,7 @@
 
 const struct audio_output_plugin *audio_output_plugins[] = {
 #ifdef HAVE_SHOUT
-	&shoutPlugin,
+	&shout_output_plugin,
 #endif
 	&null_output_plugin,
 #ifdef HAVE_FIFO
@@ -52,7 +52,7 @@ const struct audio_output_plugin *audio_output_plugins[] = {
 	&pipe_output_plugin,
 #endif
 #ifdef HAVE_ALSA
-	&alsaPlugin,
+	&alsa_output_plugin,
 #endif
 #ifdef HAVE_ROAR
 	&roar_output_plugin,
@@ -67,10 +67,10 @@ const struct audio_output_plugin *audio_output_plugins[] = {
 	&openal_output_plugin,
 #endif
 #ifdef HAVE_OSX
-	&osxPlugin,
+	&osx_output_plugin,
 #endif
 #ifdef ENABLE_RAOP_OUTPUT
-	&raopPlugin,
+	&raop_output_plugin,
 #endif
 #ifdef ENABLE_SOLARIS_OUTPUT
 	&solaris_output_plugin,