diff --git a/include/sta/os2/easy_config.hpp b/include/sta/os2/easy_config.hpp
index 1a5f975..aa58362 100644
--- a/include/sta/os2/easy_config.hpp
+++ b/include/sta/os2/easy_config.hpp
@@ -7,6 +7,10 @@
 #ifndef STA_OS2_EASY_CONFIG_HPP
 #define STA_OS2_EASY_CONFIG_HPP
 
+#ifndef STA_CONFIG_HPP
+#warning "Intended for use in <sta/config.hpp>"
+#endif // STA_CONFIG_HPP
+
 
 #ifdef STA_OS2_SYSTEM_TASKS_ENABLE
 // Enable system events used by system tasks
@@ -16,5 +20,17 @@
 #  define STA_OS2_STARTUP_ENABLE
 #endif // STA_OS2_SYSTEM_TASKS_ENABLE
 
+// 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
+#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
+#endif // STA_OS2_WATCHDOG_NAME
+
 
 #endif // STA_OS2_EASY_CONFIG_HPP