diff --git a/callback_dispatcher.cc b/callback_dispatcher.cc
index 6a29946..de06f75 100644
--- a/callback_dispatcher.cc
+++ b/callback_dispatcher.cc
@@ -4,7 +4,7 @@
 
 namespace pEp {
     bool CallbackDispatcher::once = true;
-    CallbackDispatcher dispatcher;
+    CallbackDispatcher callback_dispatcher;
 
     CallbackDispatcher::CallbackDispatcher()
     {
diff --git a/callback_dispatcher.hh b/callback_dispatcher.hh
index 76e997e..2989609 100644
--- a/callback_dispatcher.hh
+++ b/callback_dispatcher.hh
@@ -30,6 +30,6 @@ namespace pEp {
                 ::pEp_identity *partner, ::sync_handshake_signal signal);
     };
 
-    extern CallbackDispatcher dispatcher;
+    extern CallbackDispatcher callback_dispatcher;
 };