diff --git a/liblava/util/telegram.hpp b/liblava/util/telegram.hpp
index ce39ec58619799ebf1fbc0fa096637d42a8833d3..bb8d2b9c837cbf9f854d8e92acfcd1b55137c125 100644
--- a/liblava/util/telegram.hpp
+++ b/liblava/util/telegram.hpp
@@ -42,8 +42,8 @@ namespace lava {
     };
 
     struct dispatcher {
-        void setup(ui32 threadcount) {
-            pool.setup(threadcount);
+        void setup(ui32 thread_count) {
+            pool.setup(thread_count);
         }
 
         void teardown() {
diff --git a/liblava/util/thread.hpp b/liblava/util/thread.hpp
index 7a4122a413389d4e094c8b855ca07560af6a2ecc..9a758b60a4b708312338626198185e9904c01522 100644
--- a/liblava/util/thread.hpp
+++ b/liblava/util/thread.hpp
@@ -42,7 +42,7 @@ namespace lava {
         template<typename F>
         void enqueue(F f) {
             {
-                std::unique_lock<std::mutex> lock(queueMutex);
+                std::unique_lock<std::mutex> lock(queue_mutex);
                 tasks.push_back(task(f));
             }
             condition.notify_one();
@@ -59,7 +59,7 @@ namespace lava {
                 task task;
                 while (true) {
                     {
-                        std::unique_lock<std::mutex> lock(pool.queueMutex);
+                        std::unique_lock<std::mutex> lock(pool.queue_mutex);
 
                         while (!pool.stop && pool.tasks.empty())
                             pool.condition.wait(lock);
@@ -84,7 +84,7 @@ namespace lava {
         std::vector<std::thread> workers;
         std::deque<task> tasks;
 
-        std::mutex queueMutex;
+        std::mutex queue_mutex;
         std::condition_variable condition;
 
         bool stop = false;