diff --git a/src/output/Init.cxx b/src/output/Init.cxx
index 3a1509ed4..1b94e39ad 100644
--- a/src/output/Init.cxx
+++ b/src/output/Init.cxx
@@ -265,7 +265,7 @@ audio_output_new(EventLoop &normal_event_loop, EventLoop &rt_event_loop,
 		if (p == nullptr)
 			throw std::runtime_error("Missing \"type\" configuration");
 
-		plugin = AudioOutputPlugin_get(p);
+		plugin = GetAudioOutputPluginByName(p);
 		if (plugin == nullptr)
 			throw FmtRuntimeError("No such audio output plugin: {}",
 					      p);
diff --git a/src/output/Registry.cxx b/src/output/Registry.cxx
index e6225de54..fe5fadd42 100644
--- a/src/output/Registry.cxx
+++ b/src/output/Registry.cxx
@@ -94,7 +94,7 @@ constexpr const AudioOutputPlugin *audio_output_plugins[] = {
 };
 
 const AudioOutputPlugin *
-AudioOutputPlugin_get(const char *name)
+GetAudioOutputPluginByName(const char *name)
 {
 	audio_output_plugins_for_each(plugin)
 		if (StringIsEqual(plugin->name, name))
diff --git a/src/output/Registry.hxx b/src/output/Registry.hxx
index 6e6e055ca..66250acb1 100644
--- a/src/output/Registry.hxx
+++ b/src/output/Registry.hxx
@@ -9,7 +9,7 @@ struct AudioOutputPlugin;
 extern const AudioOutputPlugin *const audio_output_plugins[];
 
 const AudioOutputPlugin *
-AudioOutputPlugin_get(const char *name);
+GetAudioOutputPluginByName(const char *name);
 
 #define audio_output_plugins_for_each(plugin) \
 	for (const AudioOutputPlugin *plugin, \
diff --git a/test/run_output.cxx b/test/run_output.cxx
index aef2acd24..e4358a84a 100644
--- a/test/run_output.cxx
+++ b/test/run_output.cxx
@@ -86,7 +86,7 @@ LoadAudioOutput(const ConfigData &config, EventLoop &event_loop,
 	if (plugin_name == nullptr)
 		throw std::runtime_error("Missing \"type\" configuration");
 
-	const auto *plugin = AudioOutputPlugin_get(plugin_name);
+	const auto *plugin = GetAudioOutputPluginByName(plugin_name);
 	if (plugin == nullptr)
 		throw FmtRuntimeError("No such audio output plugin: {}",
 				      plugin_name);