diff --git a/src/concurrency/BaseThread.cpp b/src/concurrency/BaseThread.cpp
index ab39a8c9..5f304b5f 100644
--- a/src/concurrency/BaseThread.cpp
+++ b/src/concurrency/BaseThread.cpp
@@ -1,4 +1,4 @@
-#include "Thread.h"
+#include "BaseThread.h"
 #include <assert.h>
 
 namespace concurrency
diff --git a/src/concurrency/Thread.h b/src/concurrency/OSThread.h
similarity index 73%
rename from src/concurrency/Thread.h
rename to src/concurrency/OSThread.h
index f9fa60fd..52ecdf52 100644
--- a/src/concurrency/Thread.h
+++ b/src/concurrency/OSThread.h
@@ -7,11 +7,11 @@ namespace concurrency
 {
 
 #ifdef HAS_FREE_RTOS
-typedef FreeRtosThread Thread;
+typedef FreeRtosThread OSThread;
 #endif
 
 #ifdef __unix__
-typedef PosixThread Thread;
+typedef PosixThread OSThread;
 #endif
 
 } // namespace concurrency
diff --git a/src/concurrency/WorkerThread.h b/src/concurrency/WorkerThread.h
index 66111e7d..c9b2c6b3 100644
--- a/src/concurrency/WorkerThread.h
+++ b/src/concurrency/WorkerThread.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Thread.h"
+#include "OSThread.h"
 
 namespace concurrency {
 
@@ -10,7 +10,7 @@ namespace concurrency {
  *
  * @link https://www.freertos.org/RTOS_Task_Notification_As_Mailbox.html
  */
-class WorkerThread : public Thread
+class WorkerThread : public OSThread
 {
   protected:
     /**