diff --git a/obexd/client/main.c b/obexd/client/main.c
index e0e2eb5..255ee37 100644
--- a/obexd/client/main.c
+++ b/obexd/client/main.c
@@ -167,7 +167,7 @@ int main(int argc, char *argv[])
 
 	__obex_log_init("obex-client", option_debug, !option_stderr);
 
-	if (manager_init() < 0)
+	if (client_manager_init() < 0)
 		exit(EXIT_FAILURE);
 
 	DBG("Entering main loop");
@@ -176,7 +176,7 @@ int main(int argc, char *argv[])
 
 	g_source_remove(signal);
 
-	manager_exit();
+	client_manager_exit();
 
 	g_main_loop_unref(event_loop);
 
diff --git a/obexd/client/manager.c b/obexd/client/manager.c
index 4929383..8f367d6 100644
--- a/obexd/client/manager.c
+++ b/obexd/client/manager.c
@@ -255,7 +255,7 @@ static struct obc_module {
 	{ }
 };
 
-int manager_init(void)
+int client_manager_init(void)
 {
 	DBusError derr;
 	struct obc_module *module;
@@ -290,7 +290,7 @@ int manager_init(void)
 	return 0;
 }
 
-void manager_exit(void)
+void client_manager_exit(void)
 {
 	struct obc_module *module;
 
diff --git a/obexd/client/manager.h b/obexd/client/manager.h
index 8756982..e4068de 100644
--- a/obexd/client/manager.h
+++ b/obexd/client/manager.h
@@ -21,5 +21,5 @@
  *
  */
 
-int manager_init(void);
-void manager_exit(void);
+int client_manager_init(void);
+void client_manager_exit(void);