2011-02-16 Joel Sherrill <joel.sherrill@oarcorp.com>

	* ada-tests/mptests/mp01/mp01.adb, ada-tests/mptests/mp01/mptest.adb,
	ada-tests/mptests/mp01/mptest.ads,
	ada-tests/mptests/mp01/node1/mp01_node1.adb,
	ada-tests/mptests/mp01/node2/mp01_node2.adb,
	ada-tests/mptests/mp02/mptest.adb, ada-tests/mptests/mp02/mptest.ads,
	ada-tests/mptests/mp02/node1/mp02_node1.adb,
	ada-tests/mptests/mp02/node2/mp02_node2.adb,
	ada-tests/mptests/mp03/mptest.adb, ada-tests/mptests/mp03/mptest.ads,
	ada-tests/mptests/mp03/node1/mp03_node1.adb,
	ada-tests/mptests/mp03/node2/mp03_node2.adb,
	ada-tests/mptests/mp04/mptest.adb, ada-tests/mptests/mp04/mptest.ads,
	ada-tests/mptests/mp04/node1/mp04_node1.adb,
	ada-tests/mptests/mp04/node2/mp04_node2.adb,
	ada-tests/mptests/mp05/mptest.adb, ada-tests/mptests/mp05/mptest.ads,
	ada-tests/mptests/mp05/node1/mp05_node1.adb,
	ada-tests/mptests/mp05/node2/mp05_node2.adb,
	ada-tests/mptests/mp06/mptest.adb, ada-tests/mptests/mp06/mptest.ads,
	ada-tests/mptests/mp06/node1/mp06_node1.adb,
	ada-tests/mptests/mp06/node2/mp06_node2.adb,
	ada-tests/mptests/mp07/mptest.adb, ada-tests/mptests/mp07/mptest.ads,
	ada-tests/mptests/mp07/node1/mp07_node1.adb,
	ada-tests/mptests/mp07/node2/mp07_node2.adb,
	ada-tests/mptests/mp08/mptest.adb, ada-tests/mptests/mp08/mptest.ads,
	ada-tests/mptests/mp08/node1/mp08_node1.adb,
	ada-tests/mptests/mp08/node2/mp08_node2.adb,
	ada-tests/mptests/mp09/mptest.adb, ada-tests/mptests/mp09/mptest.ads,
	ada-tests/mptests/mp09/node1/mp09_node1.adb,
	ada-tests/mptests/mp09/node2/mp09_node2.adb,
	ada-tests/mptests/mp10/mptest.adb, ada-tests/mptests/mp10/mptest.ads,
	ada-tests/mptests/mp10/node1/mp10_node1.adb,
	ada-tests/mptests/mp10/node2/mp10_node2.adb,
	ada-tests/mptests/mp11/mptest.adb, ada-tests/mptests/mp11/mptest.ads,
	ada-tests/mptests/mp11/node1/mp11_node1.adb,
	ada-tests/mptests/mp11/node2/mp11_node2.adb,
	ada-tests/mptests/mp12/mptest.adb, ada-tests/mptests/mp12/mptest.ads,
	ada-tests/mptests/mp12/node1/mp12_node1.adb,
	ada-tests/mptests/mp12/node2/mp12_node2.adb,
	ada-tests/mptests/mp13/mptest.adb, ada-tests/mptests/mp13/mptest.ads,
	ada-tests/mptests/mp13/node1/mp13_node1.adb,
	ada-tests/mptests/mp13/node2/mp13_node2.adb,
	ada-tests/mptests/mp14/mptest.adb, ada-tests/mptests/mp14/mptest.ads,
	ada-tests/mptests/mp14/node1/mp14_node1.adb,
	ada-tests/mptests/mp14/node2/mp14_node2.adb,
	ada-tests/samples/base_mp/mptest.adb,
	ada-tests/samples/base_mp/mptest.ads,
	ada-tests/samples/base_sp/base_sp.adb,
	ada-tests/samples/base_sp/sptest.adb,
	ada-tests/samples/base_sp/sptest.ads,
	ada-tests/samples/hello/hello.adb,
	ada-tests/samples/hello/sptest.adb,
	ada-tests/samples/hello/sptest.ads,
	ada-tests/samples/nsecs/nsecs.adb,
	ada-tests/samples/nsecs/sptest.adb,
	ada-tests/samples/nsecs/sptest.ads,
	ada-tests/samples/ticker/sptest.adb,
	ada-tests/samples/ticker/sptest.ads,
	ada-tests/samples/ticker/ticker.adb, ada-tests/sptests/sp01/sp01.adb,
	ada-tests/sptests/sp01/sptest.adb, ada-tests/sptests/sp01/sptest.ads,
	ada-tests/sptests/sp02/sp02.adb, ada-tests/sptests/sp02/sptest.adb,
	ada-tests/sptests/sp02/sptest.ads, ada-tests/sptests/sp03/sp03.adb,
	ada-tests/sptests/sp03/sptest.adb, ada-tests/sptests/sp03/sptest.ads,
	ada-tests/sptests/sp04/sp04.adb, ada-tests/sptests/sp04/sptest.adb,
	ada-tests/sptests/sp04/sptest.ads, ada-tests/sptests/sp05/sp05.adb,
	ada-tests/sptests/sp05/sptest.adb, ada-tests/sptests/sp05/sptest.ads,
	ada-tests/sptests/sp06/sp06.adb, ada-tests/sptests/sp06/sptest.adb,
	ada-tests/sptests/sp06/sptest.ads, ada-tests/sptests/sp07/sp07.adb,
	ada-tests/sptests/sp07/sptest.adb, ada-tests/sptests/sp07/sptest.ads,
	ada-tests/sptests/sp08/sp08.adb, ada-tests/sptests/sp08/sptest.adb,
	ada-tests/sptests/sp08/sptest.ads, ada-tests/sptests/sp09/sp09.adb,
	ada-tests/sptests/sp09/sptest.adb, ada-tests/sptests/sp09/sptest.ads,
	ada-tests/sptests/sp11/sp11.adb, ada-tests/sptests/sp11/sptest.adb,
	ada-tests/sptests/sp11/sptest.ads, ada-tests/sptests/sp12/sp12.adb,
	ada-tests/sptests/sp12/sptest.adb, ada-tests/sptests/sp12/sptest.ads,
	ada-tests/sptests/sp13/sp13.adb, ada-tests/sptests/sp13/sptest.adb,
	ada-tests/sptests/sp13/sptest.ads, ada-tests/sptests/sp14/sp14.adb,
	ada-tests/sptests/sp14/sptest.adb, ada-tests/sptests/sp14/sptest.ads,
	ada-tests/sptests/sp15/sp15.adb, ada-tests/sptests/sp15/sptest.adb,
	ada-tests/sptests/sp15/sptest.ads, ada-tests/sptests/sp16/sp16.adb,
	ada-tests/sptests/sp16/sptest.adb, ada-tests/sptests/sp16/sptest.ads,
	ada-tests/sptests/sp17/sp17.adb, ada-tests/sptests/sp17/sptest.adb,
	ada-tests/sptests/sp17/sptest.ads, ada-tests/sptests/sp19/sp19.adb,
	ada-tests/sptests/sp19/sptest.adp, ada-tests/sptests/sp19/sptest.ads,
	ada-tests/sptests/sp20/sp20.adb, ada-tests/sptests/sp20/sptest.adb,
	ada-tests/sptests/sp20/sptest.ads, ada-tests/sptests/sp22/sp22.adb,
	ada-tests/sptests/sp22/sptest.adb, ada-tests/sptests/sp22/sptest.ads,
	ada-tests/sptests/sp23/sp23.adb, ada-tests/sptests/sp23/sptest.adb,
	ada-tests/sptests/sp23/sptest.ads, ada-tests/sptests/sp24/sp24.adb,
	ada-tests/sptests/sp24/sptest.adb, ada-tests/sptests/sp24/sptest.ads,
	ada-tests/sptests/sp25/sp25.adb, ada-tests/sptests/sp25/sptest.adb,
	ada-tests/sptests/sp25/sptest.ads,
	ada-tests/support/test_support.adb, ada-tests/tmtests/tm01/tm01.adb,
	ada-tests/tmtests/tm01/tmtest.adb, ada-tests/tmtests/tm01/tmtest.ads,
	ada-tests/tmtests/tm02/tm02.adb, ada-tests/tmtests/tm02/tmtest.adb,
	ada-tests/tmtests/tm02/tmtest.ads, ada-tests/tmtests/tm03/tm03.adb,
	ada-tests/tmtests/tm03/tmtest.adb, ada-tests/tmtests/tm03/tmtest.ads,
	ada-tests/tmtests/tm04/tm04.adb, ada-tests/tmtests/tm04/tmtest.adb,
	ada-tests/tmtests/tm04/tmtest.ads, ada-tests/tmtests/tm05/tm05.adb,
	ada-tests/tmtests/tm05/tmtest.adb, ada-tests/tmtests/tm05/tmtest.ads,
	ada-tests/tmtests/tm06/tm06.adb, ada-tests/tmtests/tm06/tmtest.adb,
	ada-tests/tmtests/tm06/tmtest.ads, ada-tests/tmtests/tm07/tm07.adb,
	ada-tests/tmtests/tm07/tmtest.adb, ada-tests/tmtests/tm07/tmtest.ads,
	ada-tests/tmtests/tm08/tm08.adb, ada-tests/tmtests/tm08/tmtest.adb,
	ada-tests/tmtests/tm08/tmtest.ads, ada-tests/tmtests/tm09/tm09.adb,
	ada-tests/tmtests/tm09/tmtest.adb, ada-tests/tmtests/tm09/tmtest.ads,
	ada-tests/tmtests/tm10/tm10.adb, ada-tests/tmtests/tm10/tmtest.adb,
	ada-tests/tmtests/tm10/tmtest.ads, ada-tests/tmtests/tm11/tm11.adb,
	ada-tests/tmtests/tm11/tmtest.adb, ada-tests/tmtests/tm11/tmtest.ads,
	ada-tests/tmtests/tm12/tm12.adb, ada-tests/tmtests/tm12/tmtest.adb,
	ada-tests/tmtests/tm12/tmtest.ads, ada-tests/tmtests/tm13/tm13.adb,
	ada-tests/tmtests/tm13/tmtest.adb, ada-tests/tmtests/tm13/tmtest.ads,
	ada-tests/tmtests/tm14/tm14.adb, ada-tests/tmtests/tm14/tmtest.adb,
	ada-tests/tmtests/tm14/tmtest.ads, ada-tests/tmtests/tm15/tm15.adb,
	ada-tests/tmtests/tm15/tmtest.adb, ada-tests/tmtests/tm15/tmtest.ads,
	ada-tests/tmtests/tm16/tm16.adb, ada-tests/tmtests/tm16/tmtest.adb,
	ada-tests/tmtests/tm16/tmtest.ads, ada-tests/tmtests/tm17/tm17.adb,
	ada-tests/tmtests/tm17/tmtest.adb, ada-tests/tmtests/tm17/tmtest.ads,
	ada-tests/tmtests/tm18/tm18.adb, ada-tests/tmtests/tm18/tmtest.adb,
	ada-tests/tmtests/tm18/tmtest.ads, ada-tests/tmtests/tm19/tm19.adb,
	ada-tests/tmtests/tm19/tmtest.adb, ada-tests/tmtests/tm19/tmtest.ads,
	ada-tests/tmtests/tm20/tm20.adb, ada-tests/tmtests/tm20/tmtest.adb,
	ada-tests/tmtests/tm20/tmtest.ads, ada-tests/tmtests/tm21/tm21.adb,
	ada-tests/tmtests/tm21/tmtest.adb, ada-tests/tmtests/tm21/tmtest.ads,
	ada-tests/tmtests/tm22/tm22.adb, ada-tests/tmtests/tm22/tmtest.adb,
	ada-tests/tmtests/tm22/tmtest.ads, ada-tests/tmtests/tm23/tm23.adb,
	ada-tests/tmtests/tm23/tmtest.adb, ada-tests/tmtests/tm23/tmtest.ads,
	ada-tests/tmtests/tm24/tm24.adb, ada-tests/tmtests/tm24/tmtest.adb,
	ada-tests/tmtests/tm24/tmtest.ads, ada-tests/tmtests/tm25/tm25.adb,
	ada-tests/tmtests/tm25/tmtest.adb, ada-tests/tmtests/tm25/tmtest.ads,
	ada-tests/tmtests/tm28/tm28.adb, ada-tests/tmtests/tm28/tmtest.adb,
	ada-tests/tmtests/tm28/tmtest.ads, ada-tests/tmtests/tm29/tm29.adb,
	ada-tests/tmtests/tm29/tmtest.adb, ada-tests/tmtests/tm29/tmtest.ads,
	ada-tests/tmtests/tmck/tmck.adb, ada-tests/tmtests/tmck/tmtest.adb,
	ada-tests/tmtests/tmck/tmtest.ads,
	ada-tests/tmtests/tmoverhd/dummy_rtems.adb,
	ada-tests/tmtests/tmoverhd/dummy_rtems.ads,
	ada-tests/tmtests/tmoverhd/tmoverhd.adb,
	ada-tests/tmtests/tmoverhd/tmtest.adb,
	ada-tests/tmtests/tmoverhd/tmtest.ads: Account for RTEMS binding
	child package rework. Eliminate all warnings.

1 files changed, 97 insertions, 102 deletions

diff --git a/c/src/ada-tests/sptests/sp12/sptest.adb b/c/src/ada-tests/sptests/sp12/sptest.adb
index 20e3aaaa67..93c7d411f8 100644
--- a/c/src/ada-tests/sptests/sp12/sptest.adb
+++ b/c/src/ada-tests/sptests/sp12/sptest.adb
@@ -10,7 +10,7 @@
 --
 --  
 --
---  COPYRIGHT (c) 1989-2009.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
 --  The license and distribution terms for this file may in
@@ -24,16 +24,16 @@ with INTERFACES; use INTERFACES;
 with TEST_SUPPORT;
 with TEXT_IO;
 with UNSIGNED32_IO;
+with RTEMS.SEMAPHORE;
 
 package body SPTEST is
 
---PAGE
 -- 
 --  INIT
 --
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
       STATUS : RTEMS.STATUS_CODES;
@@ -63,31 +63,31 @@ package body SPTEST is
       SPTEST.SEMAPHORE_NAME( 2 ) := RTEMS.BUILD_NAME(  'S', 'M', '2', ' ' );
       SPTEST.SEMAPHORE_NAME( 3 ) := RTEMS.BUILD_NAME(  'S', 'M', '3', ' ' );
 
-      RTEMS.SEMAPHORE_CREATE( 
+      RTEMS.SEMAPHORE.CREATE( 
          SPTEST.SEMAPHORE_NAME( 1 ), 
          1,
          RTEMS.DEFAULT_ATTRIBUTES,
-         RTEMS.NO_PRIORITY,
+         RTEMS.TASKS.NO_PRIORITY,
          SPTEST.SEMAPHORE_ID( 1 ),
          STATUS
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM1" );
 
-      RTEMS.SEMAPHORE_CREATE( 
+      RTEMS.SEMAPHORE.CREATE( 
          SPTEST.SEMAPHORE_NAME( 2 ), 
          0,
          RTEMS.PRIORITY,
-         RTEMS.NO_PRIORITY,
+         RTEMS.TASKS.NO_PRIORITY,
          SPTEST.SEMAPHORE_ID( 2 ),
          STATUS
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM2" );
 
-      RTEMS.SEMAPHORE_CREATE( 
+      RTEMS.SEMAPHORE.CREATE( 
          SPTEST.SEMAPHORE_NAME( 3 ), 
          1,
          RTEMS.DEFAULT_ATTRIBUTES,
-         RTEMS.NO_PRIORITY,
+         RTEMS.TASKS.NO_PRIORITY,
          SPTEST.SEMAPHORE_ID( 3 ),
          STATUS
       );
@@ -105,17 +105,17 @@ TEST_SUPPORT.PAUSE;
         "INIT - Binary Semaphore and Priority Inheritance Test" 
       );
 
-      RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
+      RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM2" );
 
       TEXT_IO.PUT_LINE( 
         "INIT - semaphore_create - allocated binary semaphore"
       );
-      RTEMS.SEMAPHORE_CREATE( 
+      RTEMS.SEMAPHORE.CREATE( 
          SPTEST.SEMAPHORE_NAME( 2 ), 
          0,
          RTEMS.BINARY_SEMAPHORE + RTEMS.PRIORITY + RTEMS.INHERIT_PRIORITY,
-         RTEMS.NO_PRIORITY,
+         RTEMS.TASKS.NO_PRIORITY,
          SPTEST.SEMAPHORE_ID( 2 ),
          STATUS
       );
@@ -124,20 +124,20 @@ TEST_SUPPORT.PAUSE;
       TEXT_IO.PUT_LINE( 
         "INIT - semaphore_release - allocated binary semaphore"
       );
-      RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
+      RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE OF SM2" );
 
       TEXT_IO.PUT_LINE( 
         "INIT - semaphore_delete - allocated binary semaphore"
       );
-      RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
+      RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM2" );
 
-      RTEMS.SEMAPHORE_CREATE( 
+      RTEMS.SEMAPHORE.CREATE( 
          SPTEST.SEMAPHORE_NAME( 2 ), 
          1,
          RTEMS.BINARY_SEMAPHORE + RTEMS.PRIORITY + RTEMS.INHERIT_PRIORITY,
-         RTEMS.NO_PRIORITY,
+         RTEMS.TASKS.NO_PRIORITY,
          SPTEST.SEMAPHORE_ID( 2 ),
          STATUS
       );
@@ -147,23 +147,23 @@ TEST_SUPPORT.PAUSE;
 
 TEST_SUPPORT.PAUSE;
 
-      RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
+      RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM2" );
 
-      RTEMS.SEMAPHORE_CREATE( 
+      RTEMS.SEMAPHORE.CREATE( 
          SPTEST.SEMAPHORE_NAME( 2 ), 
          0,
          RTEMS.PRIORITY,
-         RTEMS.NO_PRIORITY,
+         RTEMS.TASKS.NO_PRIORITY,
          SPTEST.SEMAPHORE_ID( 2 ),
          STATUS
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE OF SM2" );
 
-      RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
+      RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE OF SM2" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          SPTEST.TASK_NAME( 1 ), 
          4, 
          2048, 
@@ -174,7 +174,7 @@ TEST_SUPPORT.PAUSE;
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA1" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          SPTEST.TASK_NAME( 2 ), 
          4, 
          2048, 
@@ -185,7 +185,7 @@ TEST_SUPPORT.PAUSE;
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA2" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          SPTEST.TASK_NAME( 3 ), 
          4, 
          2048, 
@@ -196,7 +196,7 @@ TEST_SUPPORT.PAUSE;
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          SPTEST.TASK_ID( 1 ),
          SPTEST.TASK_1'ACCESS,
          0,
@@ -204,7 +204,7 @@ TEST_SUPPORT.PAUSE;
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          SPTEST.TASK_ID( 2 ),
          SPTEST.TASK_2'ACCESS,
          0,
@@ -212,7 +212,7 @@ TEST_SUPPORT.PAUSE;
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          SPTEST.TASK_ID( 3 ),
          SPTEST.TASK_3'ACCESS,
          0,
@@ -220,12 +220,11 @@ TEST_SUPPORT.PAUSE;
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA3" );
 
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end INIT;
 
---PAGE
 -- 
 --  PRIORITY_TEST_DRIVER
 --
@@ -233,7 +232,7 @@ TEST_SUPPORT.PAUSE;
    procedure PRIORITY_TEST_DRIVER (
       PRIORITY_BASE : in     RTEMS.UNSIGNED32
    ) is 
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
+      PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY;
       STATUS            : RTEMS.STATUS_CODES;
    begin
 
@@ -243,12 +242,12 @@ TEST_SUPPORT.PAUSE;
          case INDEX is
             when 1 | 2 | 3 => 
                SPTEST.TASK_PRIORITY( INDEX )  := 
-                  PRIORITY_BASE + RTEMS.TASK_PRIORITY( INDEX );
+                  PRIORITY_BASE + RTEMS.TASKS.PRIORITY( INDEX );
             when others    => 
                SPTEST.TASK_PRIORITY( INDEX )  := PRIORITY_BASE + 3;
          end case;
 
-         RTEMS.TASK_CREATE( 
+         RTEMS.TASKS.CREATE( 
             SPTEST.PRIORITY_TASK_NAME( INDEX ), 
             SPTEST.TASK_PRIORITY( INDEX ), 
             2048, 
@@ -266,10 +265,10 @@ TEST_SUPPORT.PAUSE;
          for INDEX in 1 .. 5
          loop
 
-            RTEMS.TASK_START( 
+            RTEMS.TASKS.START( 
                SPTEST.PRIORITY_TASK_ID( INDEX ),
                SPTEST.PRIORITY_TASK'ACCESS,
-               RTEMS.TASK_ARGUMENT( INDEX ), 
+               RTEMS.TASKS.ARGUMENT( INDEX ), 
                STATUS
             );
             TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
@@ -281,20 +280,20 @@ TEST_SUPPORT.PAUSE;
          for INDEX in reverse 1 .. 5
          loop
 
-            RTEMS.TASK_START( 
+            RTEMS.TASKS.START( 
                SPTEST.PRIORITY_TASK_ID( INDEX ),
                SPTEST.PRIORITY_TASK'ACCESS,
-               RTEMS.TASK_ARGUMENT( INDEX ), 
+               RTEMS.TASKS.ARGUMENT( INDEX ), 
                STATUS
             );
             TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START LOOP" );
       
-            RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+            RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
             TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER LOOP" );
 
             if PRIORITY_BASE = 64 then
                if INDEX = 4 then
-                  RTEMS.TASK_SET_PRIORITY( 
+                  RTEMS.TASKS.SET_PRIORITY( 
                      SPTEST.PRIORITY_TASK_ID( 5 ),
                      PRIORITY_BASE + 4,
                      PREVIOUS_PRIORITY,
@@ -311,9 +310,9 @@ TEST_SUPPORT.PAUSE;
                   );
                end if;
 
-               RTEMS.TASK_SET_PRIORITY( 
+               RTEMS.TASKS.SET_PRIORITY( 
                   SPTEST.PRIORITY_TASK_ID( 5 ),
-                  RTEMS.CURRENT_PRIORITY,
+                  RTEMS.TASKS.CURRENT_PRIORITY,
                   PREVIOUS_PRIORITY,
                   STATUS
                );
@@ -330,14 +329,14 @@ TEST_SUPPORT.PAUSE;
 
       end if;
 
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+      RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER AFTER LOOP" );
 
       if PRIORITY_BASE = 0 then
          for INDEX in 1 .. 5
          loop
 
-            RTEMS.SEMAPHORE_RELEASE( 
+            RTEMS.SEMAPHORE.RELEASE( 
                SPTEST.SEMAPHORE_ID( 2 ),
                STATUS
             );
@@ -352,23 +351,23 @@ TEST_SUPPORT.PAUSE;
       if PRIORITY_BASE = 64 then
 
          TEXT_IO.PUT_LINE( "PDRV - task_resume - PRI5" );
-         RTEMS.TASK_RESUME( SPTEST.PRIORITY_TASK_ID( 5 ), STATUS );
+         RTEMS.TASKS.RESUME( SPTEST.PRIORITY_TASK_ID( 5 ), STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" );
 
-         RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+         RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( 
            STATUS, 
            "TASK_WAKE_AFTER SO PRI5 can run" 
          );
 
-         RTEMS.TASK_DELETE( SPTEST.PRIORITY_TASK_ID( 5 ), STATUS );
+         RTEMS.TASKS.DELETE( SPTEST.PRIORITY_TASK_ID( 5 ), STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF PRI5" );
       else
 
          for INDEX in 1 .. 5
          loop
 
-            RTEMS.TASK_DELETE( 
+            RTEMS.TASKS.DELETE( 
                SPTEST.PRIORITY_TASK_ID( INDEX ),
                STATUS
             );
@@ -380,17 +379,16 @@ TEST_SUPPORT.PAUSE;
 
    end PRIORITY_TEST_DRIVER;
 
---PAGE
 -- 
 --  PRIORITY_TASK
 --
 
    procedure PRIORITY_TASK (
-      ITS_INDEX : in     RTEMS.TASK_ARGUMENT
+      ITS_INDEX : in     RTEMS.TASKS.ARGUMENT
    ) is 
       TIMEOUT          : RTEMS.INTERVAL;
-      ITS_PRIORITY     : RTEMS.TASK_PRIORITY;
-      CURRENT_PRIORITY : RTEMS.TASK_PRIORITY;
+      ITS_PRIORITY     : RTEMS.TASKS.PRIORITY;
+      CURRENT_PRIORITY : RTEMS.TASKS.PRIORITY;
       STATUS           : RTEMS.STATUS_CODES;
    begin
 
@@ -405,7 +403,7 @@ TEST_SUPPORT.PAUSE;
       TEST_SUPPORT.PUT_NAME( PRIORITY_TASK_NAME( INTEGER(ITS_INDEX) ), FALSE );
       TEXT_IO.PUT_LINE( " - semaphore_obtain - wait forever on SM2" );
    
-      RTEMS.SEMAPHORE_OBTAIN( 
+      RTEMS.SEMAPHORE.OBTAIN( 
          SPTEST.SEMAPHORE_ID( 2 ), 
          RTEMS.DEFAULT_OPTIONS, 
          TIMEOUT, 
@@ -428,20 +426,20 @@ TEST_SUPPORT.PAUSE;
          );
       end if;
 
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
 
       TEXT_IO.PUT_LINE( "PRI5 - task_delete - all tasks waiting on SM2" );
       for INDEX in 1 .. 4 
       loop
 
-         RTEMS.TASK_DELETE(  SPTEST.PRIORITY_TASK_ID( INDEX ), STATUS );
+         RTEMS.TASKS.DELETE(  SPTEST.PRIORITY_TASK_ID( INDEX ), STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE LOOP" );
 
       end loop;
 
       TEXT_IO.PUT_LINE( "PRI5 - semaphore_obtain - nested" );
-      RTEMS.SEMAPHORE_OBTAIN( 
+      RTEMS.SEMAPHORE.OBTAIN( 
          SPTEST.SEMAPHORE_ID( 2 ), 
          RTEMS.DEFAULT_OPTIONS, 
          TIMEOUT, 
@@ -450,16 +448,16 @@ TEST_SUPPORT.PAUSE;
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN NESTED" );
 
       TEXT_IO.PUT_LINE( "PRI5 - semaphore_release - nested" );
-      RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
+      RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE NESTED" );
 
       TEXT_IO.PUT_LINE( "PRI5 - semaphore_release - restore priority" );
-      RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
+      RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 2 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" );
 
-      RTEMS.TASK_SET_PRIORITY( 
+      RTEMS.TASKS.SET_PRIORITY( 
          SPTEST.PRIORITY_TASK_ID( 5 ),
-         RTEMS.CURRENT_PRIORITY,
+         RTEMS.TASKS.CURRENT_PRIORITY,
          CURRENT_PRIORITY,
          STATUS
       );
@@ -470,24 +468,25 @@ TEST_SUPPORT.PAUSE;
          STATUS, 
          "PRI5 TASK_SET_PRIORITY CURRENT" 
       );
-      RTEMS.TASK_SUSPEND( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.SUSPEND( RTEMS.SELF, STATUS );
+      -- DOES NOT RETURN.  Following check makes compiler happy
+      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
 
    end PRIORITY_TASK;
    
---PAGE
 -- 
 --  TASK_1
 --
 
    procedure TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
       SMID   : RTEMS.ID;
       STATUS : RTEMS.STATUS_CODES;
    begin
 
-      RTEMS.SEMAPHORE_IDENT( 
+      RTEMS.SEMAPHORE.IDENT( 
          SPTEST.SEMAPHORE_NAME( 1 ), 
          RTEMS.SEARCH_ALL_NODES, 
          SMID, 
@@ -499,7 +498,7 @@ TEST_SUPPORT.PAUSE;
       TEXT_IO.NEW_LINE;
 
       TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - wait forever on SM2" );
-      RTEMS.SEMAPHORE_OBTAIN( 
+      RTEMS.SEMAPHORE.OBTAIN( 
          SPTEST.SEMAPHORE_ID( 2 ),
          RTEMS.DEFAULT_MODES, 
          RTEMS.NO_TIMEOUT,
@@ -510,7 +509,7 @@ TEST_SUPPORT.PAUSE;
       TEXT_IO.PUT_LINE( "TA1 - got SM2" );
 
       TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - wait forever on SM3" );
-      RTEMS.SEMAPHORE_OBTAIN( 
+      RTEMS.SEMAPHORE.OBTAIN( 
          SPTEST.SEMAPHORE_ID( 3 ),
          RTEMS.DEFAULT_MODES, 
          RTEMS.NO_TIMEOUT,
@@ -521,7 +520,7 @@ TEST_SUPPORT.PAUSE;
       TEXT_IO.PUT_LINE( "TA1 - got SM3" );
    
       TEXT_IO.PUT_LINE( "TA1 - semaphore_obtain - get SM1 - NO_WAIT" );
-      RTEMS.SEMAPHORE_OBTAIN( 
+      RTEMS.SEMAPHORE.OBTAIN( 
          SPTEST.SEMAPHORE_ID( 1 ),
          RTEMS.NO_WAIT, 
          RTEMS.NO_TIMEOUT,
@@ -532,19 +531,19 @@ TEST_SUPPORT.PAUSE;
       TEXT_IO.PUT_LINE( "TA1 - got SM1" );
 
       TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" );
-      RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+      RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
 
 TEST_SUPPORT.PAUSE;
 
       TEXT_IO.PUT_LINE( "TA1 - semaphore_release - release SM1" );
-      RTEMS.SEMAPHORE_RELEASE( SPTEST.SEMAPHORE_ID( 1 ), STATUS );
+      RTEMS.SEMAPHORE.RELEASE( SPTEST.SEMAPHORE_ID( 1 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM1" );
      
       TEXT_IO.PUT_LINE( 
          "TA1 - semaphore_obtain - waiting for SM1 with 10 second timeout"
       );
-      RTEMS.SEMAPHORE_OBTAIN( 
+      RTEMS.SEMAPHORE.OBTAIN( 
          SPTEST.SEMAPHORE_ID( 1 ),
          RTEMS.DEFAULT_MODES, 
          10 * TEST_SUPPORT.TICKS_PER_SECOND,
@@ -555,23 +554,23 @@ TEST_SUPPORT.PAUSE;
       TEXT_IO.PUT_LINE( "TA1 - got SM1" );
    
       TEXT_IO.PUT_LINE( "TA1 - semaphore_release - release SM2" );
-      RTEMS.SEMAPHORE_RELEASE( 
+      RTEMS.SEMAPHORE.RELEASE( 
          SPTEST.SEMAPHORE_ID( 2 ),
          STATUS
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM2" );
 
       TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" );
-      RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+      RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
 
 TEST_SUPPORT.PAUSE;
 
       TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA3" );
-      RTEMS.TASK_DELETE( SPTEST.TASK_ID( 3 ), STATUS );
+      RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 3 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA3" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          SPTEST.TASK_NAME( 4 ), 
          4, 
          2048, 
@@ -582,7 +581,7 @@ TEST_SUPPORT.PAUSE;
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA4" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          SPTEST.TASK_NAME( 5 ), 
          4, 
          2048, 
@@ -593,7 +592,7 @@ TEST_SUPPORT.PAUSE;
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA5" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          SPTEST.TASK_ID( 4 ),
          SPTEST.TASK_4'ACCESS,
          0,
@@ -601,7 +600,7 @@ TEST_SUPPORT.PAUSE;
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA4" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          SPTEST.TASK_ID( 5 ),
          SPTEST.TASK_5'ACCESS,
          0,
@@ -610,53 +609,52 @@ TEST_SUPPORT.PAUSE;
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA5" );
 
       TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" );
-      RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+      RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
 
       TEXT_IO.PUT_LINE( "TA1 - task_delete - delete TA4" );
-      RTEMS.TASK_DELETE( SPTEST.TASK_ID( 4 ), STATUS );
+      RTEMS.TASKS.DELETE( SPTEST.TASK_ID( 4 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA4" );
 
       TEXT_IO.PUT_LINE( "TA1 - semaphore_release - release SM1" );
-      RTEMS.SEMAPHORE_RELEASE( 
+      RTEMS.SEMAPHORE.RELEASE( 
          SPTEST.SEMAPHORE_ID( 1 ),
          STATUS
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM1" );
 
       TEXT_IO.PUT_LINE( "TA1 - task_wake_after - sleep 5 seconds" );
-      RTEMS.TASK_WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+      RTEMS.TASKS.WAKE_AFTER( 5 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
 
       TEXT_IO.PUT_LINE( "TA1 - semaphore_delete - delete SM1" );
-      RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 1 ), STATUS );
+      RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 1 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM1" );
 
       TEXT_IO.PUT_LINE( "TA1 - semaphore_delete - delete SM3" );
-      RTEMS.SEMAPHORE_DELETE( SPTEST.SEMAPHORE_ID( 3 ), STATUS );
+      RTEMS.SEMAPHORE.DELETE( SPTEST.SEMAPHORE_ID( 3 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE OF SM3" );
 
       TEXT_IO.PUT_LINE( "TA1 - task_delete - delete self" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA1" );
 
    end TASK_1;
 
---PAGE
 -- 
 --  TASK_2
 --
 
    procedure TASK_2 (
-      ARGUMENT : in    RTEMS.TASK_ARGUMENT
+      ARGUMENT : in    RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
       STATUS            : RTEMS.STATUS_CODES;
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
+      PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY;
    begin
  
       TEXT_IO.PUT_LINE( "TA2 - semaphore_obtain - wait forever on SM1" );
-      RTEMS.SEMAPHORE_OBTAIN( 
+      RTEMS.SEMAPHORE.OBTAIN( 
          SPTEST.SEMAPHORE_ID( 1 ),
          RTEMS.DEFAULT_MODES, 
          RTEMS.NO_TIMEOUT,
@@ -667,7 +665,7 @@ TEST_SUPPORT.PAUSE;
       TEXT_IO.PUT_LINE( "TA2 - got SM1" );
    
       TEXT_IO.PUT_LINE( "TA2 - semaphore_release - release SM1" );
-      RTEMS.SEMAPHORE_RELEASE( 
+      RTEMS.SEMAPHORE.RELEASE( 
          SPTEST.SEMAPHORE_ID( 1 ),
          STATUS
       );
@@ -676,7 +674,7 @@ TEST_SUPPORT.PAUSE;
       TEXT_IO.PUT_LINE( 
          "TA2 - task_set_priority - make self highest priority task" 
       );
-      RTEMS.TASK_SET_PRIORITY(
+      RTEMS.TASKS.SET_PRIORITY(
          RTEMS.SELF,
          3,
          PREVIOUS_PRIORITY,
@@ -685,7 +683,7 @@ TEST_SUPPORT.PAUSE;
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY ON TA2" );
      
       TEXT_IO.PUT_LINE( "TA2 - semaphore_obtain - wait forever on SM2" );
-      RTEMS.SEMAPHORE_OBTAIN( 
+      RTEMS.SEMAPHORE.OBTAIN( 
          SPTEST.SEMAPHORE_ID( 2 ),
          RTEMS.DEFAULT_MODES, 
          RTEMS.NO_TIMEOUT,
@@ -696,32 +694,31 @@ TEST_SUPPORT.PAUSE;
       TEXT_IO.PUT_LINE( "TA2 - got SM2" );
    
       TEXT_IO.PUT_LINE( "TA2 - semaphore_release - release SM2" );
-      RTEMS.SEMAPHORE_RELEASE( 
+      RTEMS.SEMAPHORE.RELEASE( 
          SPTEST.SEMAPHORE_ID( 2 ),
          STATUS
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM2" );
    
       TEXT_IO.PUT_LINE( "TA2 - task_delete - delete self" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" );
 
    end TASK_2;
 
---PAGE
 -- 
 --  TASK_3
 --
 
    procedure TASK_3 (
-      ARGUMENT : in    RTEMS.TASK_ARGUMENT
+      ARGUMENT : in    RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
       STATUS : RTEMS.STATUS_CODES;
    begin
  
       TEXT_IO.PUT_LINE( "TA3 - semaphore_obtain - wait forever on SM2" );
-      RTEMS.SEMAPHORE_OBTAIN( 
+      RTEMS.SEMAPHORE.OBTAIN( 
          SPTEST.SEMAPHORE_ID( 2 ),
          RTEMS.DEFAULT_MODES, 
          RTEMS.NO_TIMEOUT,
@@ -731,14 +728,14 @@ TEST_SUPPORT.PAUSE;
       TEXT_IO.PUT_LINE( "TA3 - got SM2" );
    
       TEXT_IO.PUT_LINE( "TA3 - semaphore_release - release SM2" );
-      RTEMS.SEMAPHORE_RELEASE( 
+      RTEMS.SEMAPHORE.RELEASE( 
          SPTEST.SEMAPHORE_ID( 2 ),
          STATUS
       );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE ON SM2" );
    
       TEXT_IO.PUT_LINE( "TA3 - semaphore_obtain - wait forever on SM3" );
-      RTEMS.SEMAPHORE_OBTAIN( 
+      RTEMS.SEMAPHORE.OBTAIN( 
          SPTEST.SEMAPHORE_ID( 3 ),
          RTEMS.DEFAULT_MODES, 
          RTEMS.NO_TIMEOUT,
@@ -748,20 +745,19 @@ TEST_SUPPORT.PAUSE;
      
    end TASK_3;
 
---PAGE
 -- 
 --  TASK_4
 --
 
    procedure TASK_4 (
-      ARGUMENT : in    RTEMS.TASK_ARGUMENT
+      ARGUMENT : in    RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
       STATUS : RTEMS.STATUS_CODES;
    begin
  
       TEXT_IO.PUT_LINE( "TA4 - semaphore_obtain - wait forever on SM1" );
-      RTEMS.SEMAPHORE_OBTAIN( 
+      RTEMS.SEMAPHORE.OBTAIN( 
          SPTEST.SEMAPHORE_ID( 1 ),
          RTEMS.DEFAULT_MODES, 
          RTEMS.NO_TIMEOUT,
@@ -771,20 +767,19 @@ TEST_SUPPORT.PAUSE;
      
    end TASK_4;
 
---PAGE
 -- 
 --  TASK_5
 --
 
    procedure TASK_5 (
-      ARGUMENT : in    RTEMS.TASK_ARGUMENT
+      ARGUMENT : in    RTEMS.TASKS.ARGUMENT
    ) is
       pragma Unreferenced(ARGUMENT);
       STATUS : RTEMS.STATUS_CODES;
    begin
  
       TEXT_IO.PUT_LINE( "TA5 - semaphore_obtain - wait forever on SM1" );
-      RTEMS.SEMAPHORE_OBTAIN( 
+      RTEMS.SEMAPHORE.OBTAIN( 
          SPTEST.SEMAPHORE_ID( 1 ),
          RTEMS.DEFAULT_MODES, 
          RTEMS.NO_TIMEOUT,
@@ -795,7 +790,7 @@ TEST_SUPPORT.PAUSE;
       TEXT_IO.PUT_LINE( "TA5 - got SM1" );
    
       TEXT_IO.PUT_LINE( "TA5 - semaphore_obtain - wait forever on SM1" );
-      RTEMS.SEMAPHORE_OBTAIN( 
+      RTEMS.SEMAPHORE.OBTAIN( 
          SPTEST.SEMAPHORE_ID( 1 ),
          RTEMS.DEFAULT_MODES, 
          RTEMS.NO_TIMEOUT,