diff --git a/src/gcal-manager.c b/src/gcal-manager.c
index e9b51eef..37253f6d 100644
--- a/src/gcal-manager.c
+++ b/src/gcal-manager.c
@@ -1541,7 +1541,7 @@ gcal_manager_get_event_from_shell_search (GcalManager *manager,
 }
 
 gboolean
-gcal_manager_is_client_ready (GcalManager *manager)
+gcal_manager_is_goa_client_ready (GcalManager *manager)
 {
   GcalManagerPrivate *priv;
 
@@ -1553,7 +1553,7 @@ gcal_manager_is_client_ready (GcalManager *manager)
 }
 
 GoaClient*
-gcal_manager_get_client (GcalManager *manager)
+gcal_manager_get_goa_client (GcalManager *manager)
 {
   GcalManagerPrivate *priv;
 
diff --git a/src/gcal-manager.h b/src/gcal-manager.h
index beee5005..9eead908 100644
--- a/src/gcal-manager.h
+++ b/src/gcal-manager.h
@@ -164,9 +164,9 @@ gboolean       gcal_manager_load_completed          (GcalManager        *manager
 GcalEventData* gcal_manager_get_event_from_shell_search (GcalManager        *manager,
                                                          const gchar        *uuid);
 
-gboolean       gcal_manager_is_client_ready          (GcalManager        *manager);
+gboolean       gcal_manager_is_goa_client_ready    (GcalManager        *manager);
 
-GoaClient*     gcal_manager_get_client               (GcalManager        *manager);
+GoaClient*     gcal_manager_get_goa_client         (GcalManager        *manager);
 
 G_END_DECLS
 
diff --git a/src/gcal-source-dialog.c b/src/gcal-source-dialog.c
index 5023852a..9a21c182 100644
--- a/src/gcal-source-dialog.c
+++ b/src/gcal-source-dialog.c
@@ -2209,9 +2209,9 @@ gcal_source_dialog_set_manager (GcalSourceDialog *dialog,
    * If the GoaClient is already loaded, fetch the online accounts
    * directly. Otherwise, wait for it to be ready.
    */
-  if (gcal_manager_is_client_ready (manager))
+  if (gcal_manager_is_goa_client_ready (manager))
     {
-      goa_client_ready_cb (dialog, gcal_manager_get_client (manager), NULL);
+      goa_client_ready_cb (dialog, gcal_manager_get_goa_client (manager), NULL);
     }
   else
     {