diff --git a/Server/DataStructures/SharedBarriers.h b/Server/DataStructures/SharedBarriers.h
index af81a17ca..7363395e3 100644
--- a/Server/DataStructures/SharedBarriers.h
+++ b/Server/DataStructures/SharedBarriers.h
@@ -6,11 +6,12 @@ struct SharedBarriers {
    SharedBarriers () :  update_ongoing(false), number_of_queries(0) { }
 
    // Mutex to protect access to the boolean variable
-   boost::interprocess::interprocess_mutex      update_mutex;
-   boost::interprocess::interprocess_mutex      query_mutex;
+   boost::interprocess::interprocess_mutex   pending_update_mutex;
+   boost::interprocess::interprocess_mutex   update_mutex;
+   boost::interprocess::interprocess_mutex   query_mutex;
 
    // Condition that no update is running
-   boost::interprocess::interprocess_condition  update_finished_condition;
+   boost::interprocess::interprocess_condition  no_running_queries_condition;
 
    // Is there an ongoing update?
    bool update_ongoing;