diff --git a/sched/init/nx_start.c b/sched/init/nx_start.c
index 1425087ab3c..dd27cdf9f73 100644
--- a/sched/init/nx_start.c
+++ b/sched/init/nx_start.c
@@ -81,8 +81,8 @@
  * and by a series of task lists.  All of these tasks lists are declared
  * below. Although it is not always necessary, most of these lists are
  * prioritized so that common list handling logic can be used (only the
- * g_readytorun, the g_pendingtasks, and the g_waitingforsemaphore lists
- * need to be prioritized).
+ * g_readytorun and g_pendingtasks lists, and the wait lists in each
+ * semaphore, event and message queue, need to be prioritized).
  */
 
 /* This is the list of all tasks that are ready to run.  This is a
diff --git a/sched/mqueue/msgrcv.c b/sched/mqueue/msgrcv.c
index a67cfd13d9c..664daeab39d 100644
--- a/sched/mqueue/msgrcv.c
+++ b/sched/mqueue/msgrcv.c
@@ -238,7 +238,7 @@ ssize_t msgrcv(int msqid, FAR void *msgp, size_t msgsz, long msgtyp,
       FAR struct tcb_s *rtcb = this_task();
 
       /* Find the highest priority task that is waiting for
-       * this queue to be not-full in g_waitingformqnotfull list.
+       * this queue to be not-full, in the waitfornotfull list of the queue.
        * This must be performed in a critical section because
        * messages can be sent from interrupt handlers.
        */
diff --git a/sched/mqueue/msgsnd.c b/sched/mqueue/msgsnd.c
index 6ddd94b9776..9f4edb8bdbc 100644
--- a/sched/mqueue/msgsnd.c
+++ b/sched/mqueue/msgsnd.c
@@ -233,8 +233,8 @@ int msgsnd(int msqid, FAR const void *msgp, size_t msgsz, int msgflg)
           FAR struct tcb_s *rtcb = this_task();
 
           /* Find the highest priority task that is waiting for
-           * this queue to be non-empty in g_waitingformqnotempty
-           * list. enter_critical_section() should give us sufficient
+           * this queue to be non-empty, in the waitfornotempty list of
+           * the queue. enter_critical_section() should give us sufficient
            * protection since interrupts should never cause a change
            * in this list
            */
diff --git a/sched/sched/sched.h b/sched/sched/sched.h
index 212f379a71c..1d45d5b6da6 100644
--- a/sched/sched/sched.h
+++ b/sched/sched/sched.h
@@ -48,8 +48,8 @@
  * and by a series of task lists.  All of these tasks lists are declared
  * below. Although it is not always necessary, most of these lists are
  * prioritized so that common list handling logic can be used (only the
- * g_readytorun, the g_pendingtasks, and the g_waitingforsemaphore lists
- * need to be prioritized).
+ * g_readytorun and g_pendingtasks lists, and the wait lists in each
+ * semaphore, event and message queue, need to be prioritized).
  */
 
 #define list_readytorun()        (&g_readytorun)
@@ -154,8 +154,8 @@ enum task_deliver_e
  * and by a series of task lists.  All of these tasks lists are declared
  * below. Although it is not always necessary, most of these lists are
  * prioritized so that common list handling logic can be used (only the
- * g_readytorun, the g_pendingtasks, and the g_waitingforsemaphore lists
- * need to be prioritized).
+ * g_readytorun and g_pendingtasks lists, and the wait lists in each
+ * semaphore, event and message queue, need to be prioritized).
  */
 
 /* This is the list of all tasks that are ready to run.  This is a