changes remerged after lost in disk crash -- recovered from snapshot, partially recovered working tree, etc

26 files changed, 105 insertions, 109 deletions

diff --git a/testsuites/tmtests/tm01/task1.c b/testsuites/tmtests/tm01/task1.c
index 0b1863bada..4e7dae89cd 100644
--- a/testsuites/tmtests/tm01/task1.c
+++ b/testsuites/tmtests/tm01/task1.c
@@ -161,7 +161,7 @@ rtems_task Test_task(
   }
 
   put_time(
-    "rtems_semaphore_obtain",
+    "rtems_semaphore_obtain: available",
     semaphore_obtain_time,
     OPERATION_COUNT * OPERATION_COUNT,
     semaphore_obtain_loop_time,
@@ -169,7 +169,7 @@ rtems_task Test_task(
   );
 
   put_time(
-    "rtems_semaphore_obtain (RTEMS_NO_WAIT)",
+    "rtems_semaphore_obtain: not available -- NO_WAIT",
     semaphore_obtain_no_wait_time,
     OPERATION_COUNT * OPERATION_COUNT,
     semaphore_obtain_loop_time,
@@ -177,7 +177,7 @@ rtems_task Test_task(
   );
 
   put_time(
-    "rtems_semaphore_release",
+    "rtems_semaphore_release: no waiting tasks",
     semaphore_release_time,
     OPERATION_COUNT * OPERATION_COUNT * 2,
     semaphore_release_loop_time * 2,
diff --git a/testsuites/tmtests/tm02/task1.c b/testsuites/tmtests/tm02/task1.c
index 47e6c28d0a..fed5e63b12 100644
--- a/testsuites/tmtests/tm02/task1.c
+++ b/testsuites/tmtests/tm02/task1.c
@@ -146,7 +146,7 @@ rtems_task Low_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_semaphore_obtain (blocking)",
+    "rtems_semaphore_obtain: not available -- caller blocks",
     end_time,
     OPERATION_COUNT,
     0,
diff --git a/testsuites/tmtests/tm03/task1.c b/testsuites/tmtests/tm03/task1.c
index 71b4c33e90..f0ad2559bd 100644
--- a/testsuites/tmtests/tm03/task1.c
+++ b/testsuites/tmtests/tm03/task1.c
@@ -139,7 +139,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_semaphore_release (preemptive)",
+    "rtems_semaphore_release: task readied -- preempts caller",
     end_time,
     OPERATION_COUNT,
     0,
diff --git a/testsuites/tmtests/tm04/task1.c b/testsuites/tmtests/tm04/task1.c
index 603724dddb..0b10c92bf0 100644
--- a/testsuites/tmtests/tm04/task1.c
+++ b/testsuites/tmtests/tm04/task1.c
@@ -94,7 +94,7 @@ rtems_task Highest_task(
     end_time = Read_timer();
 
     put_time(
-      "rtems_task_restart (blocked, preempt)",
+      "rtems_task_restart: blocked task -- preempts caller",
       end_time,
       1,
       0,
@@ -113,7 +113,7 @@ rtems_task Highest_task(
   end_time = Read_timer();
 
     put_time(
-      "rtems_task_restart (ready, preempt)",
+      "rtems_task_restart: ready task -- preempts caller",
       end_time,
       1,
       0,
@@ -160,7 +160,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_semaphore_release (readying)",
+    "rtems_semaphore_release: task readied -- returns to caller",
     end_time,
     OPERATION_COUNT,
     0,
@@ -237,7 +237,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_restart (suspended)",
+    "rtems_task_restart: suspended task -- returns to caller",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -253,7 +253,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_delete (suspended)",
+    "rtems_task_delete: suspended task",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -281,7 +281,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_restart (ready)",
+    "rtems_task_restart: ready task -- returns to caller",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -303,7 +303,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_restart (blocked, no preempt)",
+    "rtems_task_restart: blocked task -- returns to caller",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -320,7 +320,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_delete (blocked)",
+    "rtems_task_delete: blocked task",
     end_time,
     OPERATION_COUNT,
     overhead,
diff --git a/testsuites/tmtests/tm05/task1.c b/testsuites/tmtests/tm05/task1.c
index 031c5b64d1..c531bf347b 100644
--- a/testsuites/tmtests/tm05/task1.c
+++ b/testsuites/tmtests/tm05/task1.c
@@ -90,7 +90,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_resume (causing preempt)",
+    "rtems_task_resume: task readied -- preempts caller",
     end_time,
     OPERATION_COUNT,
     0,
@@ -119,7 +119,7 @@ rtems_task Low_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_suspend self",
+    "rtems_task_suspend: calling task",
     end_time,
     OPERATION_COUNT,
     0,
diff --git a/testsuites/tmtests/tm06/task1.c b/testsuites/tmtests/tm06/task1.c
index ffaef7117d..0eb0f2aa3c 100644
--- a/testsuites/tmtests/tm06/task1.c
+++ b/testsuites/tmtests/tm06/task1.c
@@ -88,7 +88,7 @@ rtems_task Task_1(
   overhead = Read_timer();
 
   put_time(
-    "rtems_task_restart self",
+    "rtems_task_restart: calling task",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -116,7 +116,7 @@ rtems_task Task_1(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_suspend (no preempt)",
+    "rtems_task_suspend: returns to caller",
     end_time,
     OPERATION_COUNT,
     0,
@@ -129,7 +129,7 @@ rtems_task Task_1(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_resume (no preempt)",
+    "rtems_task_resume: task readied -- returns to caller",
     end_time,
     OPERATION_COUNT,
     0,
@@ -142,7 +142,7 @@ rtems_task Task_1(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_delete (others)",
+    "rtems_task_delete: ready task",
     end_time,
     OPERATION_COUNT,
     0,
diff --git a/testsuites/tmtests/tm07/task1.c b/testsuites/tmtests/tm07/task1.c
index 8cc65ed292..975a1cbf1a 100644
--- a/testsuites/tmtests/tm07/task1.c
+++ b/testsuites/tmtests/tm07/task1.c
@@ -14,7 +14,7 @@
 #define TEST_INIT
 #include "system.h"
 
-rtems_id Task_id[OPERATION_COUNT+1], task_index;
+rtems_id Task_id[ OPERATION_COUNT+1 ], task_index;
 
 rtems_task High_task(
   rtems_task_argument argument
@@ -84,7 +84,7 @@ rtems_task High_task(
     end_time = Read_timer();
 
     put_time(
-      "rtems_task_restart suspended/preempt",
+      "rtems_task_restart: suspended task -- preempts caller",
       end_time,
       OPERATION_COUNT,
       0,
diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c
index b29d6c6206..698317edae 100644
--- a/testsuites/tmtests/tm08/task1.c
+++ b/testsuites/tmtests/tm08/task1.c
@@ -97,7 +97,7 @@ rtems_task test_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_set_priority current priority",
+    "rtems_task_set_priority: obtain current priority",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -110,7 +110,7 @@ rtems_task test_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_set_priority no preempt",
+    "rtems_task_set_priority: returns to caller",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -127,7 +127,7 @@ rtems_task test_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_mode (current)",
+    "rtems_task_mode: obtain current mode",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -150,7 +150,7 @@ rtems_task test_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_mode (no reschedule)",
+    "rtems_task_mode: no reschedule",
     end_time,
     OPERATION_COUNT * 2,
     overhead,
@@ -162,7 +162,7 @@ rtems_task test_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_mode (reschedule)",
+    "rtems_task_mode: reschedule -- returns to caller",
     end_time,
     1,
     0,
@@ -244,7 +244,7 @@ rtems_task test_task1(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_mode (preemptive)",
+    "rtems_task_mode: reschedule -- preempts caller",
     end_time,
     1,
     0,
diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c
index ebdc8f6e6c..4dbc0e14e7 100644
--- a/testsuites/tmtests/tm09/task1.c
+++ b/testsuites/tmtests/tm09/task1.c
@@ -184,7 +184,7 @@ void queue_test()
   }
 
   put_time(
-    "rtems_message_queue_send (no tasks waiting)",
+    "rtems_message_queue_send: no waiting tasks",
     send_time,
     OPERATION_COUNT * OPERATION_COUNT,
     send_loop_time,
@@ -192,7 +192,7 @@ void queue_test()
   );
 
   put_time(
-    "rtems_message_queue_urgent (no tasks waiting)",
+    "rtems_message_queue_urgent: no waiting tasks",
     urgent_time,
     OPERATION_COUNT * OPERATION_COUNT,
     urgent_loop_time,
@@ -200,7 +200,7 @@ void queue_test()
   );
 
   put_time(
-    "rtems_message_queue_receive (messages available)",
+    "rtems_message_queue_receive: available",
     receive_time,
     OPERATION_COUNT * OPERATION_COUNT * 2,
     receive_loop_time * 2,
@@ -208,7 +208,7 @@ void queue_test()
   );
 
   put_time(
-    "rtems_message_queue_flush (empty queue)",
+    "rtems_message_queue_flush: no messages flushed",
     empty_flush_time,
     OPERATION_COUNT,
     0,
@@ -216,7 +216,7 @@ void queue_test()
   );
 
   put_time(
-    "rtems_message_queue_flush (messages flushed)",
+    "rtems_message_queue_flush: messages flushed",
     flush_time,
     OPERATION_COUNT,
     0,
diff --git a/testsuites/tmtests/tm10/task1.c b/testsuites/tmtests/tm10/task1.c
index 8cc6ed99a2..a49e61e1ab 100644
--- a/testsuites/tmtests/tm10/task1.c
+++ b/testsuites/tmtests/tm10/task1.c
@@ -105,7 +105,7 @@ void test_init()
   end_time = Read_timer();
 
   put_time(
-    "rtems_message_queue_receive (RTEMS_NO_WAIT)",
+    "rtems_message_queue_receive: not available -- NO_WAIT",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -153,7 +153,7 @@ rtems_task Low_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_message_queue_receive (blocking)",
+    "rtems_message_queue_receive: not available -- caller blocks",
     end_time,
     OPERATION_COUNT,
     0,
diff --git a/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c
index d76ef0f1b0..296b742aea 100644
--- a/testsuites/tmtests/tm11/task1.c
+++ b/testsuites/tmtests/tm11/task1.c
@@ -143,7 +143,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_message_queue_send (preemptive)",
+    "rtems_message_queue_send: task readied -- preempts caller",
     end_time,
     OPERATION_COUNT,
     0,
diff --git a/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c
index df67bb6099..84640165d3 100644
--- a/testsuites/tmtests/tm12/task1.c
+++ b/testsuites/tmtests/tm12/task1.c
@@ -119,7 +119,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_message_queue_send (readying)",
+    "rtems_message_queue_send: task readied -- returns to caller",
     end_time,
     OPERATION_COUNT,
     overhead,
diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c
index bb78752560..0499817149 100644
--- a/testsuites/tmtests/tm13/task1.c
+++ b/testsuites/tmtests/tm13/task1.c
@@ -142,7 +142,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_message_queue_urgent (preemptive)",
+    "rtems_message_queue_urgent: task readied -- preempts caller",
     end_time,
     OPERATION_COUNT,
     0,
diff --git a/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c
index 39f0453862..24c40c13b3 100644
--- a/testsuites/tmtests/tm14/task1.c
+++ b/testsuites/tmtests/tm14/task1.c
@@ -119,7 +119,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_message_queue_urgent (readying)",
+    "rtems_message_queue_urgent: task readied -- returns to caller",
     end_time,
     OPERATION_COUNT,
     overhead,
diff --git a/testsuites/tmtests/tm15/task1.c b/testsuites/tmtests/tm15/task1.c
index 837167db20..1cfc554fe8 100644
--- a/testsuites/tmtests/tm15/task1.c
+++ b/testsuites/tmtests/tm15/task1.c
@@ -98,7 +98,7 @@ void test_init()
   end_time = Read_timer();
 
   put_time(
-    "rtems_event_receive (current)",
+    "rtems_event_receive: obtain current events",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -119,7 +119,7 @@ void test_init()
   end_time = Read_timer();
 
   put_time(
-    "rtems_event_receive (RTEMS_NO_WAIT)",
+    "rtems_event_receive: not available -- NO_WAIT",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -137,7 +137,7 @@ rtems_task Low_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_event_receive (blocking)",
+    "rtems_event_receive: not available -- caller blocks",
     end_time,
     OPERATION_COUNT,
     0,
@@ -155,7 +155,7 @@ rtems_task Low_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_event_send (non-blocking)",
+    "rtems_event_send: no task readied",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -172,7 +172,7 @@ rtems_task Low_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_event_receive (available)",
+    "rtems_event_receive: available",
     end_time,
     1,
     0,
@@ -185,7 +185,7 @@ rtems_task Low_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_event_send (readying)",
+    "rtems_event_send: task readied -- returns to caller",
     end_time,
     OPERATION_COUNT,
     overhead,
diff --git a/testsuites/tmtests/tm16/task1.c b/testsuites/tmtests/tm16/task1.c
index 793a063194..e73d3ea12b 100644
--- a/testsuites/tmtests/tm16/task1.c
+++ b/testsuites/tmtests/tm16/task1.c
@@ -136,7 +136,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_event_send (preemptive)",
+    "rtems_event_send: task readied -- preempts caller",
     end_time,
     OPERATION_COUNT,
     0,
diff --git a/testsuites/tmtests/tm17/task1.c b/testsuites/tmtests/tm17/task1.c
index 2277833deb..fd7b0780c2 100644
--- a/testsuites/tmtests/tm17/task1.c
+++ b/testsuites/tmtests/tm17/task1.c
@@ -115,7 +115,7 @@ rtems_task Last_task(
   overhead = Read_timer();
 
   put_time(
-    "rtems_task_set_priority (preemptive)",
+    "rtems_task_set_priority: preempts caller",
     end_time,
     OPERATION_COUNT,
     overhead,
diff --git a/testsuites/tmtests/tm18/task1.c b/testsuites/tmtests/tm18/task1.c
index 37fd5035a6..ba5ae84a6f 100644
--- a/testsuites/tmtests/tm18/task1.c
+++ b/testsuites/tmtests/tm18/task1.c
@@ -100,7 +100,7 @@ rtems_task Last_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_delete self",
+    "rtems_task_delete: calling task",
     end_time,
     OPERATION_COUNT,
     0,
diff --git a/testsuites/tmtests/tm19/task1.c b/testsuites/tmtests/tm19/task1.c
index 3d02126dc1..af25ff9cb2 100644
--- a/testsuites/tmtests/tm19/task1.c
+++ b/testsuites/tmtests/tm19/task1.c
@@ -94,15 +94,13 @@ rtems_asr Process_asr_for_pass_1(
   end_time = Read_timer();
 
   put_time(
-    "rtems_signal_send (self)",
+    "rtems_signal_send: signal to self",
     end_time,
     1,
     0,
     CALLING_OVERHEAD_SIGNAL_SEND
   );
 
-  puts( "SIGNAL_ENTER (non-preemptive) na" );
-
   Timer_initialize();
 }
 
@@ -112,8 +110,6 @@ rtems_asr Process_asr_for_pass_2(
 {
   rtems_status_code status;
 
-  puts( "SIGNAL_ENTER (preemptive) na" );
-
   status = rtems_task_resume( Task_id[ 3 ] );
   directive_failed( status, "rtems_task_resume" );
 
@@ -143,7 +139,7 @@ rtems_task Task_1(
   end_time = Read_timer();
 
   put_time(
-    "rtems_signal_send (non-preemptive)",
+    "rtems_signal_send: returns to caller",
     end_time,
     1,
     0,
@@ -158,7 +154,7 @@ rtems_task Task_1(
   end_time = Read_timer();
 
   put_time(
-    "SIGNAL_RETURN (non-preemptive)",
+    "exit ASR overhead: returns to calling task",
     end_time,
     1,
     0,
@@ -200,7 +196,7 @@ rtems_task Task_3(
   end_time = Read_timer();
 
   put_time(
-    "SIGNAL_RETURN (preemptive)",
+    "exit ASR overhead: returns to preempting task",
     end_time,
     1,
     0,
diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c
index 22d514add6..7eb8506f49 100644
--- a/testsuites/tmtests/tm20/task1.c
+++ b/testsuites/tmtests/tm20/task1.c
@@ -137,7 +137,7 @@ rtems_task Task_1(
   end_time = Read_timer();
 
   put_time(
-    "rtems_partition_get_buffer (available)",
+    "rtems_partition_get_buffer: available",
     end_time,
     1,
     0,
@@ -162,7 +162,7 @@ rtems_task Task_1(
   end_time = Read_timer();
 
   put_time(
-    "rtems_partition_get_buffer (not available)",
+    "rtems_partition_get_buffer: not available",
     end_time,
     1,
     0,
@@ -223,7 +223,7 @@ rtems_task Task_1(
   end_time = Read_timer();
 
   put_time(
-    "rtems_region_get_segment (available)",
+    "rtems_region_get_segment: available",
     end_time,
     1,
     0,
@@ -241,7 +241,7 @@ rtems_task Task_1(
   end_time = Read_timer();
 
   put_time(
-    "rtems_region_get_segment (RTEMS_NO_WAIT)",
+    "rtems_region_get_segment: not available -- NO_WAIT",
     end_time,
     1,
     0,
@@ -256,7 +256,7 @@ rtems_task Task_1(
   end_time = Read_timer();
 
   put_time(
-    "rtems_region_return_segment (no tasks waiting)",
+    "rtems_region_return_segment: no waiting tasks",
     end_time,
     1,
     0,
@@ -286,7 +286,7 @@ rtems_task Task_1(
   end_time = Read_timer();
 
   put_time(
-    "rtems_region_return_segment (preempt)",
+    "rtems_region_return_segment: task readied -- preempts caller",
     end_time,
     1,
     0,
@@ -437,7 +437,7 @@ rtems_task Task_2(
   end_time = Read_timer();
 
   put_time(
-    "rtems_region_get_segment (blocking)",
+    "rtems_region_get_segment: not available -- caller blocks",
     end_time,
     1,
     0,
@@ -454,7 +454,7 @@ rtems_task Task_2(
   end_time = Read_timer();
 
   put_time(
-    "rtems_region_return_segment (ready -- return)",
+    "rtems_region_return_segment: task readied -- returns to caller",
     end_time,
     1,
     0,
diff --git a/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c
index 3bf607e823..e0bab9217b 100644
--- a/testsuites/tmtests/tm22/task1.c
+++ b/testsuites/tmtests/tm22/task1.c
@@ -97,7 +97,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_message_queue_broadcast (readying)",
+    "rtems_message_queue_broadcast: task readied -- returns to caller",
     end_time,
     1,
     0,
@@ -151,7 +151,7 @@ rtems_task Low_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_message_queue_broadcast (no waiting tasks)",
+    "rtems_message_queue_broadcast: no waiting tasks",
     end_time,
     OPERATION_COUNT,
     1,
@@ -171,7 +171,7 @@ rtems_task Low_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_message_queue_broadcast (preempt)",
+    "rtems_message_queue_broadcast: task readied -- preempts caller",
     end_time,
     1,
     0,
diff --git a/testsuites/tmtests/tm23/task1.c b/testsuites/tmtests/tm23/task1.c
index 55380ecc12..d503244779 100644
--- a/testsuites/tmtests/tm23/task1.c
+++ b/testsuites/tmtests/tm23/task1.c
@@ -122,7 +122,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_timer_fire_after (inactive)",
+    "rtems_timer_fire_after: inactive",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -135,7 +135,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_timer_fire_after (active)",
+    "rtems_timer_fire_after: active",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -148,7 +148,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_timer_cancel (active)",
+    "rtems_timer_cancel: active",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -162,7 +162,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_timer_cancel (inactive)",
+    "rtems_timer_cancel: inactive",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -176,7 +176,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_timer_reset (inactive)",
+    "rtems_timer_reset: inactive",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -189,7 +189,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_timer_reset (active)",
+    "rtems_timer_reset: active",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -213,7 +213,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_timer_fire_when (inactive)",
+    "rtems_timer_fire_when: inactive",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -227,7 +227,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_timer_fire_when (active)",
+    "rtems_timer_fire_when: active",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -240,7 +240,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_timer_delete (active)",
+    "rtems_timer_delete: active",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -265,7 +265,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_timer_delete (inactive)",
+    "rtems_timer_delete: inactive",
     end_time,
     OPERATION_COUNT,
     overhead,
diff --git a/testsuites/tmtests/tm24/task1.c b/testsuites/tmtests/tm24/task1.c
index 4f8de47336..58e6eba6b8 100644
--- a/testsuites/tmtests/tm24/task1.c
+++ b/testsuites/tmtests/tm24/task1.c
@@ -85,7 +85,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "rtems_task_wake_after (no context switch)",
+    "rtems_task_wake_after: yield -- returns to caller",
     end_time,
     OPERATION_COUNT,
     overhead,
@@ -110,7 +110,7 @@ rtems_task Tasks(
     end_time = Read_timer();
 
     put_time(
-      "rtems_task_wake_after (context switch)",
+      "rtems_task_wake_after: yields -- preempts caller",
       end_time,
       OPERATION_COUNT,
       overhead,
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index 377ccf6dd4..aef869dd96 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -173,7 +173,7 @@ rtems_task High_task(
   end_time = Read_timer();
  
   put_time(
-    "INTERRUPT DISABLE",
+    "_ISR_Disable",
     end_time,
     1,
     0,
@@ -185,7 +185,7 @@ rtems_task High_task(
   end_time = Read_timer();
  
   put_time(
-    "INTERRUPT FLASH",
+    "_ISR_Flash",
     end_time,
     1,
     0,
@@ -197,7 +197,7 @@ rtems_task High_task(
   end_time = Read_timer();
  
   put_time(
-    "INTERRUPT ENABLE",
+    "_ISR_Enable",
     end_time,
     1,
     0,
@@ -209,7 +209,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "THREAD_DISABLE_DISPATCH",
+    "_Thread_Disable_dispatch",
     end_time,
     1,
     0,
@@ -221,7 +221,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "THREAD_ENABLE_DISPATCH",
+    "_Thread_Enable_dispatch",
     end_time,
     1,
     0,
@@ -233,7 +233,7 @@ rtems_task High_task(
   end_time = Read_timer();
 
   put_time(
-    "THREAD_SET_STATE",
+    "_Thread_Set_state",
     end_time,
     1,
     0,
@@ -253,7 +253,7 @@ rtems_task Middle_task(
   end_time = Read_timer();
 
   put_time(
-    "THREAD_DISPATCH (NO FP)",
+    "_Thread_Disptach (NO FP)",
     end_time,
     1,
     0,
@@ -289,7 +289,7 @@ rtems_task Low_task(
   end_time = Read_timer();
 
   put_time(
-    "CONTEXT_SWITCH (NO FP)",
+    "context switch: no floating point contexts",
     end_time,
     1,
     0,
@@ -306,7 +306,7 @@ rtems_task Low_task(
   end_time = Read_timer();
 
   put_time(
-    "CONTEXT_SWITCH (SELF)",
+    "context switch: self",
     end_time,
     1,
     0,
@@ -318,7 +318,7 @@ rtems_task Low_task(
   end_time = Read_timer();
 
   put_time(
-    "CONTEXT_SWITCH (Initialised)",
+    "context switch: to another task",
     end_time,
     1,
     0,
@@ -349,7 +349,7 @@ rtems_task Floating_point_task_1(
   end_time = Read_timer();
 
   put_time(
-    "CONTEXT_SWITCH (restore 1st FP)",
+    "fp context switch: restore 1st FP task",
     end_time,
     1,
     0,
@@ -376,7 +376,7 @@ rtems_task Floating_point_task_1(
   end_time = Read_timer();
 
   put_time(
-    "CONTEXT_SWITCH (used->init FP)",
+    "fp context switch: save idle, restore initialized",
     end_time,
     1,
     0,
@@ -413,7 +413,7 @@ rtems_task Floating_point_task_2(
   end_time = Read_timer();
 
   put_time(
-    "CONTEXT_SWITCH (init->init FP)",
+    "fp context switch: save idle, restore idle",
     end_time,
     1,
     0,
@@ -442,7 +442,7 @@ rtems_task Floating_point_task_2(
   end_time = Read_timer();
 
   put_time(
-    "CONTEXT_SWITCH (used->used FP)",
+    "fp context switch: save initialized, restore initialized",
     end_time,
     1,
     0,
@@ -462,7 +462,7 @@ void complete_test( void )
   end_time = Read_timer();
 
   put_time(
-    "THREAD_RESUME",
+    "_Thread_Resume",
     end_time,
     1,
     0,
@@ -476,7 +476,7 @@ void complete_test( void )
   end_time = Read_timer();
 
   put_time(
-    "THREAD_UNBLOCK",
+    "_Thread_Unblock",
     end_time,
     1,
     0,
@@ -490,7 +490,7 @@ void complete_test( void )
   end_time = Read_timer();
 
   put_time(
-    "THREAD_READY",
+    "_Thread_Ready",
     end_time,
     1,
     0,
@@ -510,7 +510,7 @@ void complete_test( void )
   end_time = Read_timer();
 
   put_time(
-    "THREAD_GET",
+    "_Thread_Get",
     end_time,
     OPERATION_COUNT,
     0,
@@ -523,7 +523,7 @@ void complete_test( void )
   end_time = Read_timer();
 
   put_time(
-    "SEMAPHORE_GET",
+    "_Semaphore_Get",
     end_time,
     OPERATION_COUNT,
     0,
@@ -536,7 +536,7 @@ void complete_test( void )
   end_time = Read_timer();
 
   put_time(
-    "THREAD_GET invalid id",
+    "_Thread_Get: invalid id",
     end_time,
     OPERATION_COUNT,
     0,
diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
index a47e434200..aa346fb29e 100644
--- a/testsuites/tmtests/tm27/task1.c
+++ b/testsuites/tmtests/tm27/task1.c
@@ -104,7 +104,7 @@ rtems_task Task_1(
   Interrupt_return_time = Read_timer();
 
   put_time(
-    "INTERRUPT_ENTER (no preempt)",
+    "interrupt entry overhead: returns to interrupted task",
     Interrupt_enter_time,
     1,
     0,
@@ -112,7 +112,7 @@ rtems_task Task_1(
   );
 
   put_time(
-    "INTERRUPT_RETURN (no preempt)",
+    "interrupt exit overhead: returns to interrupted task",
     Interrupt_return_time,
     1,
     0,
@@ -138,7 +138,7 @@ rtems_task Task_1(
   Interrupt_return_time = Read_timer();
 
   put_time(
-    "INTERRUPT_ENTER (nested interrupt)",
+    "interrupt entry overhead: returns to nested interrupt",
     Interrupt_enter_nested_time,
     1,
     0,
@@ -146,7 +146,7 @@ rtems_task Task_1(
   );
 
   put_time(
-    "INTERRUPT_RETURN (nested interrupt)",
+    "interrupt exit overhead: returns to nested interrupt",
     Interrupt_return_nested_time,
     1,
     0,
@@ -193,7 +193,7 @@ rtems_task Task_2(
   end_time = Read_timer();
 
   put_time(
-    "INTERRUPT_ENTER (preempt)",
+    "interrupt entry overhead: returns to preempting task",
     Interrupt_enter_time,
     1,
     0,
@@ -201,7 +201,7 @@ rtems_task Task_2(
   );
 
   put_time(
-    "INTERRUPT_RETURN (preempt)",
+    "interrupt exit overhead: returns to preempting task",
     end_time,
     1,
     0,
diff --git a/testsuites/tmtests/tm29/task1.c b/testsuites/tmtests/tm29/task1.c
index c6691e6ee1..9600942b6d 100644
--- a/testsuites/tmtests/tm29/task1.c
+++ b/testsuites/tmtests/tm29/task1.c
@@ -57,7 +57,7 @@ rtems_task Init(
   end_time = Read_timer();
 
   put_time(
-    "rtems_rate_monotonic_period (initial)",
+    "rtems_rate_monotonic_period: initiate period -- returns to caller",
     end_time,
     1,
     0,
@@ -69,7 +69,7 @@ rtems_task Init(
   end_time = Read_timer();
 
   put_time(
-    "rtems_rate_monotonic_period (STATUS)",
+    "rtems_rate_monotonic_period: obtain status",
     end_time,
     1,
     0,
@@ -93,7 +93,7 @@ rtems_task Init(
   end_time = Read_timer();
 
   put_time(
-    "rtems_rate_monotonic_delete (cancelled)",
+    "rtems_rate_monotonic_delete: inactive",
     end_time,
     1,
     0,
@@ -111,7 +111,7 @@ rtems_task Init(
   end_time = Read_timer();
 
   put_time(
-    "rtems_rate_monotonic_delete (active)",
+    "rtems_rate_monotonic_delete: active",
     end_time,
     1,
     0,
@@ -195,7 +195,7 @@ rtems_task Low_task(
   overhead = Read_timer();
 
   put_time(
-    "rtems_rate_monotonic_period (blocking)",
+    "rtems_rate_monotonic_period: conclude periods -- caller blocks",
     end_time,
     OPERATION_COUNT,
     overhead,