diff --git a/common/branch-mgr.c b/common/branch-mgr.c
index 2758754..b7964f0 100644
--- a/common/branch-mgr.c
+++ b/common/branch-mgr.c
@@ -320,7 +320,7 @@ publish_repo_update_event (const char *repo_id, const char *commit_id)
     snprintf (buf, sizeof(buf), "repo-update\t%s\t%s",
               repo_id, commit_id);
 
-    publish_event (seaf->mq_mgr, SEAFILE_SERVER_CHANNEL_EVENT, buf);
+    seaf_mq_manager_publish_event (seaf->mq_mgr, SEAFILE_SERVER_CHANNEL_EVENT, buf);
 }
 
  static void
diff --git a/common/mq-mgr.c b/common/mq-mgr.c
index f8cd389..8ed703f 100644
--- a/common/mq-mgr.c
+++ b/common/mq-mgr.c
@@ -32,7 +32,7 @@ seaf_mq_manager_channel_new (SeafMqManager *mgr, const char *channel)
 }
 
 int
-publish_event (SeafMqManager *mgr, const char *channel, const char *content)
+seaf_mq_manager_publish_event (SeafMqManager *mgr, const char *channel, const char *content)
 {
     int ret = 0;
 
@@ -57,7 +57,7 @@ publish_event (SeafMqManager *mgr, const char *channel, const char *content)
 }
 
 char *
-pop_event (SeafMqManager *mgr, const char *channel)
+seaf_mq_manager_pop_event (SeafMqManager *mgr, const char *channel)
 {
     GAsyncQueue *async_queue = g_hash_table_lookup (mgr->priv->chans, channel);
     if (!async_queue) {
diff --git a/common/mq-mgr.h b/common/mq-mgr.h
index c845cc9..4a413e9 100644
--- a/common/mq-mgr.h
+++ b/common/mq-mgr.h
@@ -14,9 +14,9 @@ SeafMqManager *
 seaf_mq_manager_new ();
 
 int
-publish_event (SeafMqManager *mgr, const char *channel, const char *content);
+seaf_mq_manager_publish_event (SeafMqManager *mgr, const char *channel, const char *content);
 
 char *
-pop_event (SeafMqManager *mgr, const char *channel);
+seaf_mq_manager_pop_event (SeafMqManager *mgr, const char *channel);
 
 #endif
diff --git a/common/rpc-service.c b/common/rpc-service.c
index ba4a2c2..26bcab6 100644
--- a/common/rpc-service.c
+++ b/common/rpc-service.c
@@ -245,7 +245,7 @@ seafile_publish_event(const char *channel, const char *content, GError **error)
         return -1;
     }
 
-    ret = publish_event (seaf->mq_mgr, channel, content);
+    ret = seaf_mq_manager_publish_event (seaf->mq_mgr, channel, content);
 
     return ret;
 }
@@ -257,7 +257,7 @@ seafile_pop_event(const char *channel, GError **error)
         g_set_error (error, SEAFILE_DOMAIN, SEAF_ERR_BAD_ARGS, "Argument should not be null");
         return NULL;
     }
-    return pop_event (seaf->mq_mgr, channel);
+    return seaf_mq_manager_pop_event (seaf->mq_mgr, channel);
 }
 #endif
 
diff --git a/server/http-server.c b/server/http-server.c
index 36d66b0..a1410f8 100644
--- a/server/http-server.c
+++ b/server/http-server.c
@@ -531,7 +531,7 @@ publish_repo_event (RepoEventData *rdata)
                      rdata->client_name ? rdata->client_name : "",
                      rdata->repo_id, rdata->path ? rdata->path : "/");
 
-    publish_event (seaf->mq_mgr, SEAFILE_SERVER_CHANNEL_EVENT, buf->str);
+    seaf_mq_manager_publish_event (seaf->mq_mgr, SEAFILE_SERVER_CHANNEL_EVENT, buf->str);
 
     g_string_free (buf, TRUE);
 }
@@ -544,7 +544,7 @@ publish_stats_event (StatsEventData *rdata)
                      rdata->etype, rdata->user,
                      rdata->repo_id, rdata->bytes);
 
-    publish_event (seaf->mq_mgr, SEAFILE_SERVER_CHANNEL_STATS, buf->str);
+    seaf_mq_manager_publish_event (seaf->mq_mgr, SEAFILE_SERVER_CHANNEL_STATS, buf->str);
 
     g_string_free (buf, TRUE);
 }