diff --git a/include/sta/os2/easy_config.hpp b/include/sta/os2/easy_config.hpp
index aa58362..0993087 100644
--- a/include/sta/os2/easy_config.hpp
+++ b/include/sta/os2/easy_config.hpp
@@ -20,16 +20,22 @@
 #  define STA_OS2_STARTUP_ENABLE
 #endif // STA_OS2_SYSTEM_TASKS_ENABLE
 
+
+#define STA_OS2_MAKE_NAME(prefix, suffix)   prefix ## suffix
+#define STA_OS2_MAKE_HANDLE_NAME(x)         STA_OS2_MAKE_NAME(x, Handle)
+#define STA_OS2_MAKE_CALLBACK_NAME(x)       STA_OS2_MAKE_NAME(x, Callback)
+#define STA_OS2_MAKE_TASK_NAME(x)           STA_OS2_MAKE_NAME(x, Task)
+
 // Use common base name for watchdog timer handle and callback
 #ifdef STA_OS2_WATCHDOG_TIMER_NAME
-#  define STA_OS2_WATCHDOG_TIMER_HANDLE     STA_OS2_WATCHDOG_TIMER_NAME ## Handle
-#  define STA_OS2_WATCHDOG_TIMER_CALLBACK   STA_OS2_WATCHDOG_TIMER_NAME ## Callback
+#  define STA_OS2_WATCHDOG_TIMER_HANDLE     STA_OS2_MAKE_HANDLE_NAME(STA_OS2_WATCHDOG_TIMER_NAME)
+#  define STA_OS2_WATCHDOG_TIMER_CALLBACK   STA_OS2_MAKE_CALLBACK_NAME(STA_OS2_WATCHDOG_TIMER_NAME)
 #endif // STA_OS2_WATCHDOG_TIMER_NAME
 
 // Use common base name for watchdog task handle and entry function
 #ifdef STA_OS2_WATCHDOG_NAME
-#  define STA_OS2_WATCHDOG_HANDLE           STA_OS2_WATCHDOG_NAME ## Handle
-#  define STA_OS2_WATCHDOG_ENTRY_FUNCTION   STA_OS2_WATCHDOG_NAME ## Task
+#  define STA_OS2_WATCHDOG_HANDLE           STA_OS2_MAKE_HANDLE_NAME(STA_OS2_WATCHDOG_NAME)
+#  define STA_OS2_WATCHDOG_ENTRY_FUNCTION   STA_OS2_MAKE_TASK_NAME(STA_OS2_WATCHDOG_NAME)
 #endif // STA_OS2_WATCHDOG_NAME