diff --git a/os/rt/include/chsys.h b/os/rt/include/chsys.h
index 5b7355ade..4371feb87 100644
--- a/os/rt/include/chsys.h
+++ b/os/rt/include/chsys.h
@@ -362,26 +362,26 @@ static inline void chSysUnlockFromISR(void) {
 }
 
 /**
- * @brief   Conditionally enters the kernel lock state.
+ * @brief   Unconditionally enters the kernel lock state.
  * @note    Can be called without previous knowledge of the current lock state.
  *          The final state is "s-locked".
  *
  * @special
  */
-static inline void chSysConditionalLock(void) {
+static inline void chSysUnconditionalLock(void) {
 
   if (port_irq_enabled(port_get_irq_status()))
     chSysLock();
 }
 
 /**
- * @brief   Conditionally leaves the kernel lock state.
+ * @brief   Unconditionally leaves the kernel lock state.
  * @note    Can be called without previous knowledge of the current lock state.
  *          The final state is "normal".
  *
  * @special
  */
-static inline void chSysConditionalUnlock(void) {
+static inline void chSysUnconditionalUnlock(void) {
 
   if (!port_irq_enabled(port_get_irq_status()))
     chSysUnlock();
diff --git a/os/rt/include/chthreads.h b/os/rt/include/chthreads.h
index 5c270f9b2..03ac3fba7 100644
--- a/os/rt/include/chthreads.h
+++ b/os/rt/include/chthreads.h
@@ -168,7 +168,7 @@ typedef msg_t (*tfunc_t)(void *);
  *
  * @param[in] name      the name of the threads queue variable
  */
-#define _threads_queue_t_DATA(name) {(thread_t *)&name, (thread_t *)&name}
+#define _THREADS_QUEUE_DATA(name) {(thread_t *)&name, (thread_t *)&name}
 
 /**
  * @brief   Static threads queue object initializer.
@@ -177,8 +177,8 @@ typedef msg_t (*tfunc_t)(void *);
  *
  * @param[in] name      the name of the threads queue variable
  */
-#define threads_queue_t_DECL(name)                                          \
-  threads_queue_t name = _threads_queue_t_DATA(name)
+#define _THREADS_QUEUE_DECL(name)                                           \
+  threads_queue_t name = _THREADS_QUEUE_DATA(name)
 /** @} */
 
 /**