Index: testsuites/psxtmtests/psxtmtests_plan.csv
===================================================================
--- testsuites/psxtmtests/psxtmtests_plan.csv	(revision c625a800285390bf472a371a2d0742b03a8158ce)
+++ testsuites/psxtmtests/psxtmtests_plan.csv	(revision 072fe30203834ad7edb09bab6b289568d4c48dda)
@@ -2,11 +2,11 @@
 "pthread_mutex_init","psxtmmutex01","psxtmtest_init_destroy","Yes"
 "pthread_mutex_destroy","psxtmmutex01","psxtmtest_init_destroy","Yes"
-"pthread_mutex_lock - not available, block","psxtmmutex02","psxtmtest_blocking","Yes"
+"pthread_mutex_lock - not available: block","psxtmmutex02","psxtmtest_blocking","Yes"
 "pthread_mutex_lock - available","psxtmmutex03","psxtmtest_single","Yes"
 "pthread_mutex_trylock - available","psxtmmutex03","psxtmtest_single","Yes"
 "pthread_mutex_trylock - not available","psxtmmutex03","psxtmtest_single","Yes"
 "pthread_mutex_unlock - no threads waiting","psxtmmutex03","psxtmtest_single","Yes"
-"pthread_mutex_unlock - thread waiting, no preempt","psxtmmutex05","psxtmtest_unblocking_nopreempt","Yes"
-"pthread_mutex_unlock - thread waiting, preempt","psxtmmutex06","psxtmtest_unblocking_preempt","Yes"
+"pthread_mutex_unlock - thread waiting: no preempt","psxtmmutex05","psxtmtest_unblocking_nopreempt","Yes"
+"pthread_mutex_unlock - thread waiting: preempt","psxtmmutex06","psxtmtest_unblocking_preempt","Yes"
 "pthread_mutex_timedlock - available","psxtmmutex03","psxtmtest_single","Yes"
 "pthread_mutex_timedlock - not available, block","psxtmmutex04","psxtmtest_blocking","Yes"
@@ -17,9 +17,9 @@
 "pthread_cond_destroy","psxtmcond01","psxtmtest_init_destroy","No"
 "pthread_cond_signal - no threads waiting","psxtmcond02","psxtmtest_single","No"
-"pthread_cond_signal - thread waiting, no preempt","psxtmcond03","psxtmtest_unblocking_nopreempt","No"
-"pthread_cond_signal - thread waiting, preempt","psxtmcond04","psxtmtest_unblocking_preempt","No"
+"pthread_cond_signal - thread waiting: no preempt","psxtmcond03","psxtmtest_unblocking_nopreempt","No"
+"pthread_cond_signal - thread waiting: preempt","psxtmcond04","psxtmtest_unblocking_preempt","No"
 "pthread_cond_broadcast - no threads waiting","psxtmcond05","psxtmtest_single","No"
-"pthread_cond_broadcast -  threads waiting, no preempt","psxtmcond06","psxtmtest_unblocking_nopreempt","No"
-"pthread_cond_broadcast -  threads waiting, preempt","psxtmcond07","psxtmtest_unblocking_preempt","No"
+"pthread_cond_broadcast -  threads waiting: no preempt","psxtmcond06","psxtmtest_unblocking_nopreempt","No"
+"pthread_cond_broadcast -  threads waiting: preempt","psxtmcond07","psxtmtest_unblocking_preempt","No"
 
 "pthread_cond_wait - blocks (mutex+condvar pattern)","psxtmcond08","psxtmtest_blocking","No"
@@ -36,8 +36,9 @@
 "pthread_getschedparam","psxtmthread04","psxtmtest_single w/multiple timings","No"
 "pthread_setschedparam - no thread switch","psxtmthread04","psxtmtest_single w/multiple timings","No"
-"pthread_setschedparam - lower own priority, preempt","psxtmthread05","psxtmtest_single","Yes"
-"pthread_setschedparam - raise other priority, preempt","psxtmthread06","psxtmtest_single","Yes"
+"pthread_setschedparam - lower own priority: preempt","psxtmthread05","psxtmtest_single","Yes"
+"pthread_setschedparam - raise other priority: preempt","psxtmthread06","psxtmtest_single","Yes"
 ,,,
-"pthread_once",,,
+"pthread_once - first time","psxtmonce01","psxtmtest_single","No"
+"pthread_once - second time","psxtmonce02","psxtmtest_single","No"
 ,,,
 "pthread_key_create","psxtmkey01","psxtmtest_single","Yes"
@@ -58,6 +59,6 @@
 "pthread_barrier_destroy","psxtmbarrier01","psxtmtest_init_destroy","Yes"
 "pthread_barrier_wait - blocking","psxtmbarrier02","psxtmtest_blocking","Yes"
-"pthread_barrier_wait - releasing, no preempt","psxtmbarrier03","psxtmtest_unblocking_nopreempt","Yes"
-"pthread_barrier_wait - releasing, preempt","psxtmbarrier04","psxtmtest_unblocking_preempt","No"
+"pthread_barrier_wait - releasing: no preempt","psxtmbarrier03","psxtmtest_unblocking_nopreempt","Yes"
+"pthread_barrier_wait - releasing: preempt","psxtmbarrier04","psxtmtest_unblocking_preempt","No"
 ,,,
 "pthread_spin_init","psxspin01","psxtmtest_init_destroy","No"
@@ -77,6 +78,6 @@
 "pthread_rwlock_timedrdlock - not available, blocks","psxtmrwlock03","psxtmtest_blocking","Yes"
 "pthread_rwlock_unlock - no threads waiting","psxtmrwlock01","psxtmtest_single","Yes"
-"pthread_rwlock_unlock - thread waiting, no preempt","psxtmrwlock06",,"Yes"
-"pthread_rwlock_unlock - thread waiting, preempt","psxtmrwlock07",,"Yes"
+"pthread_rwlock_unlock - thread waiting: no preempt","psxtmrwlock06",,"Yes"
+"pthread_rwlock_unlock - thread waiting: preempt","psxtmrwlock07",,"Yes"
 "pthread_rwlock_wrlock - available","psxtmrwlock01","psxtmtest_single","Yes"
 "pthread_rwlock_wrlock - not available, blocks","psxtmwrlock04","psxtmtest_blocking","Yes"
@@ -96,9 +97,9 @@
 "mq_timedreceive - not available, blocks",,"psxtmtest_single","No"
 "mq_send - no threads waiting",,"psxtmtest_single","Yes"
-"mq_send - thread waiting, no preempt",,"psxtmtest_unblocking_nopreempt","No"
-"mq_send - thread waiting, preempt",,"psxtmtest_unblocking_preempt","No"
+"mq_send - thread waiting: no preempt",,"psxtmtest_unblocking_nopreempt","No"
+"mq_send - thread waiting: preempt",,"psxtmtest_unblocking_preempt","No"
 "mq_timedsend - no threads waiting",,"psxtmtest_single","Yes"
-"mq_timedsend - thread waiting, no preempt",,"psxtmtest_unblocking_nopreempt","No"
-"mq_timedsend - thread waiting, preemption",,"psxtmtest_unblocking_preempt","No"
+"mq_timedsend - thread waiting: no preempt",,"psxtmtest_unblocking_nopreempt","No"
+"mq_timedsend - thread waiting: preemption",,"psxtmtest_unblocking_preempt","No"
 "mq_notify ",,"psxtmtest_single","Yes"
 ,,,
@@ -116,6 +117,6 @@
 "sem_trywait - not available","psxtmsem02","psxtmtest_single","Yes"
 "sem_post - no threads waiting","psxtmsem02","psxtmtest_single","Yes"
-"sem_post - thread waiting, no preempt","psxsemtm04","psxtmtest_unblocking_nopreempt","Yes"
-"sem_post - thread waiting, preempt","psxtmsem05","psxtmtest_unblocking_preempt","Yes"
+"sem_post - thread waiting: no preempt","psxsemtm04","psxtmtest_unblocking_nopreempt","Yes"
+"sem_post - thread waiting: preempt","psxtmsem05","psxtmtest_unblocking_preempt","Yes"
 "sem_getvalue","psxtmsem02","psxtmtest_single","Yes"
 ,,,
