diff --git a/src/addon/client.cpp b/src/addon/client.cpp
index c91a025723b..71c691b6fb3 100644
--- a/src/addon/client.cpp
+++ b/src/addon/client.cpp
@@ -104,7 +104,7 @@ bool addons_client::upload_addon(const std::string& id, std::string& response_me
 	response_message.clear();
 
 	config cfg;
-	get_addon_info(id, cfg);
+	get_addon_pbl_info(id, cfg);
 
 	utils::string_map i18n_symbols;
 	i18n_symbols["addon_title"] = cfg["title"];
@@ -121,7 +121,7 @@ bool addons_client::upload_addon(const std::string& id, std::string& response_me
 			passphrase[n] = 'a' + (rand()%26);
 		}
 		cfg["passphrase"] = passphrase;
-		set_addon_info(id, cfg);
+		set_addon_pbl_info(id, cfg);
 
 		LOG_ADDONS << "automatically generated an initial passphrase for " << id << '\n';
 	}
@@ -155,7 +155,7 @@ bool addons_client::delete_remote_addon(const std::string& id, std::string& resp
 	response_message.clear();
 
 	config cfg;
-	get_addon_info(id, cfg);
+	get_addon_pbl_info(id, cfg);
 
 	utils::string_map i18n_symbols;
 	i18n_symbols["addon_title"] = cfg["title"];
diff --git a/src/addon/manager.cpp b/src/addon/manager.cpp
index 6de4cd245dd..3df19c78042 100644
--- a/src/addon/manager.cpp
+++ b/src/addon/manager.cpp
@@ -83,13 +83,13 @@ bool have_addon_pbl_info(const std::string& addon_name)
 		file_exists(parentd+"/"+addon_name+"/_server.pbl");
 }
 
-void get_addon_info(const std::string& addon_name, config& cfg)
+void get_addon_pbl_info(const std::string& addon_name, config& cfg)
 {
 	scoped_istream stream = istream_file(get_pbl_file_path(addon_name));
 	read(cfg, *stream);
 }
 
-void set_addon_info(const std::string& addon_name, const config& cfg)
+void set_addon_pbl_info(const std::string& addon_name, const config& cfg)
 {
 	scoped_ostream stream = ostream_file(get_pbl_file_path(addon_name));
 	write(*stream, cfg);
diff --git a/src/addon/manager.hpp b/src/addon/manager.hpp
index 3f10ae2a773..c3152658754 100644
--- a/src/addon/manager.hpp
+++ b/src/addon/manager.hpp
@@ -49,7 +49,7 @@ bool have_addon_in_vcs_tree(const std::string& addon_name);
  * @param cfg                     A config object to store the add-on's
  *                                properties.
  */
-void get_addon_info(const std::string& addon_name, class config& cfg);
+void get_addon_pbl_info(const std::string& addon_name, class config& cfg);
 
 /**
  * Sets the publish information for an add-on
@@ -58,7 +58,7 @@ void get_addon_info(const std::string& addon_name, class config& cfg);
  * @param cfg                     A config object from which the add-on's
  *                                properties are copied.
  */
-void set_addon_info(const std::string& addon_name, const class config& cfg);
+void set_addon_pbl_info(const std::string& addon_name, const class config& cfg);
 
 /**
  * Replaces underscores to dress up file or dirnames as add-on titles.