diff --git a/extras/cplusplus/cplusplus.hpp b/extras/cplusplus/cplusplus.hpp
index cc58031..a78e146 100644
--- a/extras/cplusplus/cplusplus.hpp
+++ b/extras/cplusplus/cplusplus.hpp
@@ -19,8 +19,8 @@
  * 
  */
 
-#ifndef COM_THOLUSI_ESP_OPEN_RTOS_CPLUSPLUS_HPP
-#define	COM_THOLUSI_ESP_OPEN_RTOS_CPLUSPLUS_HPP
+#ifndef ESP_OPEN_RTOS_CPLUSPLUS_HPP
+#define	ESP_OPEN_RTOS_CPLUSPLUS_HPP
 
 #include <stdlib.h>
 
@@ -64,5 +64,5 @@ inline void operator delete[](void * ptr)
     free(ptr);
 }
 
-#endif	/* COM_THOLUSI_ESP_OPEN_RTOS_CPLUSPLUS_HPP */
+#endif	/* ESP_OPEN_RTOS_CPLUSPLUS_HPP */
 
diff --git a/extras/thread/mutex.hpp b/extras/thread/mutex.hpp
index d3db1da..b4e56a4 100644
--- a/extras/thread/mutex.hpp
+++ b/extras/thread/mutex.hpp
@@ -19,8 +19,8 @@
  * 
  */
 
-#ifndef COM_THOLUSI_ESP_OPEN_RTOS_MUTEX_HPP
-#define	COM_THOLUSI_ESP_OPEN_RTOS_MUTEX_HPP
+#ifndef ESP_OPEN_RTOS_MUTEX_HPP
+#define	ESP_OPEN_RTOS_MUTEX_HPP
 
 #include "semphr.h"
 
@@ -86,5 +86,5 @@ private:
 } //namespace esp_open_rtos {
 
 
-#endif	/* COM_THOLUSI_ESP_OPEN_RTOS_MUTEX_HPP */
+#endif	/* ESP_OPEN_RTOS_MUTEX_HPP */
 
diff --git a/extras/thread/queue.hpp b/extras/thread/queue.hpp
index fd14166..e02bec6 100644
--- a/extras/thread/queue.hpp
+++ b/extras/thread/queue.hpp
@@ -19,8 +19,8 @@
  * 
  */
 
-#ifndef COM_THOLUSI_ESP_OPEN_RTOS_QUEUE_HPP
-#define	COM_THOLUSI_ESP_OPEN_RTOS_QUEUE_HPP
+#ifndef ESP_OPEN_RTOS_QUEUE_HPP
+#define	ESP_OPEN_RTOS_QUEUE_HPP
 
 #include "FreeRTOS.h"
 #include "queue.h"
@@ -116,5 +116,5 @@ private:
 } //namespace esp_open_rtos {
 
 
-#endif	/* COM_THOLUSI_ESP_OPEN_RTOS_QUEUE_HPP */
+#endif	/* ESP_OPEN_RTOS_QUEUE_HPP */
 
diff --git a/extras/thread/task.hpp b/extras/thread/task.hpp
index dc527f0..a8a5c5b 100644
--- a/extras/thread/task.hpp
+++ b/extras/thread/task.hpp
@@ -19,8 +19,8 @@
  * 
  */
 
-#ifndef COM_THOLUSI_ESP_OPEN_RTOS_TASK_HPP
-#define	COM_THOLUSI_ESP_OPEN_RTOS_TASK_HPP
+#ifndef ESP_OPEN_RTOS_TASK_HPP
+#define	ESP_OPEN_RTOS_TASK_HPP
 
 #include "FreeRTOS.h"
 #include "task.h"
@@ -95,5 +95,5 @@ private:
 } //namespace esp_open_rtos {
 
 
-#endif	/* COM_THOLUSI_ESP_OPEN_RTOS_TASK_HPP */
+#endif	/* ESP_OPEN_RTOS_TASK_HPP */
 
diff --git a/extras/timer/countdown.hpp b/extras/timer/countdown.hpp
index ff1a2bf..71dd55c 100644
--- a/extras/timer/countdown.hpp
+++ b/extras/timer/countdown.hpp
@@ -19,8 +19,8 @@
  * 
  */
 
-#ifndef COM_THOLUSI_ESP_OPEN_RTOS_TIMER_HPP
-#define	COM_THOLUSI_ESP_OPEN_RTOS_TIMER_HPP
+#ifndef ESP_OPEN_RTOS_TIMER_HPP
+#define	ESP_OPEN_RTOS_TIMER_HPP
 
 #include "FreeRTOS.h"
 #include "task.h"