Index: c/src/ada-tests/mptests/mp01/mp01.adb
===================================================================
--- c/src/ada-tests/mptests/mp01/mp01.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp01/mp01.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -10,5 +10,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -21,4 +21,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -29,5 +30,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -41,5 +42,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp01/mptest.adb
===================================================================
--- c/src/ada-tests/mptests/mp01/mptest.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp01/mptest.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -23,4 +23,6 @@
 with INTERFACES; use INTERFACES;
 with RTEMS;
+with RTEMS.CLOCK;
+with RTEMS.TASKS;
 with TEST_SUPPORT;
 with TEXT_IO;
@@ -29,5 +31,4 @@
 package body MPTEST is
 
---PAGE
 --
 --  INIT
@@ -35,5 +36,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       C      : CHARACTER;
@@ -62,10 +63,10 @@
       TIME := ( 1988, 12, 31, 9, 0, 0, 0 );
 
-      RTEMS.CLOCK_SET( TIME, STATUS );
+      RTEMS.CLOCK.SET( TIME, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_SET" );
 
       TEXT_IO.PUT_LINE( "Creating task 1 (Global)" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          MPTEST.TASK_NAME( 1 ), 
          1, 
@@ -80,5 +81,5 @@
       TEXT_IO.PUT_LINE( "Creating task 2 (Global)" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          MPTEST.TASK_NAME( 2 ), 
          1, 
@@ -93,5 +94,5 @@
       TEXT_IO.PUT_LINE( "Creating task 3 (Local)" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          MPTEST.TASK_NAME( 3 ), 
          1, 
@@ -104,5 +105,5 @@
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE OF TA3" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.TASK_ID( 1 ),
          MPTEST.TEST_TASK'ACCESS,
@@ -112,5 +113,5 @@
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA1" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.TASK_ID( 2 ),
          MPTEST.TEST_TASK'ACCESS,
@@ -120,5 +121,5 @@
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START OF TA2" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.TASK_ID( 3 ),
          MPTEST.TEST_TASK'ACCESS,
@@ -128,10 +129,9 @@
       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
 --
 --  TEST_TASK
@@ -139,5 +139,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       TIME   : RTEMS.TIME_OF_DAY;
@@ -146,8 +146,8 @@
    begin
 
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
+      RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
    
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
+      RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
 
@@ -160,5 +160,5 @@
       TEXT_IO.NEW_LINE;
 
-      RTEMS.TASK_WAKE_AFTER( 
+      RTEMS.TASKS.WAKE_AFTER( 
          TEST_SUPPORT.TASK_NUMBER( TID ) * 5 * 
            TEST_SUPPORT.TICKS_PER_SECOND, 
@@ -167,5 +167,5 @@
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
           
-      RTEMS.CLOCK_GET( RTEMS.CLOCK_GET_TOD, TIME'ADDRESS, STATUS );
+      RTEMS.CLOCK.GET( RTEMS.CLOCK.GET_TOD, TIME'ADDRESS, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "CLOCK_GET" );
 
@@ -187,5 +187,5 @@
          TEXT_IO.PUT_LINE( " - deleting self" );
 
-         RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+         RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
@@ -206,5 +206,5 @@
          TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( 2 ), TRUE );
          
-         RTEMS.TASK_IDENT( 
+         RTEMS.TASKS.IDENT( 
             MPTEST.TASK_NAME( 2 ),
             RTEMS.SEARCH_ALL_NODES,
@@ -218,5 +218,5 @@
          TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( 2 ), TRUE );
 
-         RTEMS.TASK_DELETE( TID, STATUS );
+         RTEMS.TASKS.DELETE( TID, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF TA2" );
 
Index: c/src/ada-tests/mptests/mp01/mptest.ads
===================================================================
--- c/src/ada-tests/mptests/mp01/mptest.ads	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp01/mptest.ads	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 
 package MPTEST is
@@ -42,5 +43,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, INIT);
@@ -55,5 +56,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK);
Index: c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb
===================================================================
--- c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp01/node1/mp01_node1.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb
===================================================================
--- c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp01/node2/mp01_node2.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp02/mptest.adb
===================================================================
--- c/src/ada-tests/mptests/mp02/mptest.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp02/mptest.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -23,4 +23,5 @@
 with INTERFACES; use INTERFACES;
 with RTEMS;
+with RTEMS.TASKS;
 with TEST_SUPPORT;
 with TEXT_IO;
@@ -29,5 +30,4 @@
 package body MPTEST is
 
---PAGE
 --
 --  INIT
@@ -35,5 +35,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS : RTEMS.STATUS_CODES;
@@ -53,5 +53,5 @@
       TEXT_IO.PUT_LINE( "Creating test task (Global)" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          MPTEST.TASK_NAME( TEST_SUPPORT.NODE ),
          1, 
@@ -64,5 +64,5 @@
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_CREATE" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.TASK_ID( 1 ),
          MPTEST.TEST_TASK'ACCESS,
@@ -72,10 +72,9 @@
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
 
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end INIT;
 
---PAGE
 --
 --  TEST_TASK
@@ -83,5 +82,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       TID         : RTEMS.ID;
@@ -93,5 +92,5 @@
    begin
 
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
+      RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
    
@@ -106,5 +105,5 @@
       loop
 
-         RTEMS.TASK_IDENT( 
+         RTEMS.TASKS.IDENT( 
             MPTEST.TASK_NAME( REMOTE_NODE ),
             RTEMS.SEARCH_ALL_NODES,
@@ -122,5 +121,5 @@
 
       TEXT_IO.PUT_LINE( "Getting TID of remote task (1 node)" );
-      RTEMS.TASK_IDENT( 
+      RTEMS.TASKS.IDENT( 
          MPTEST.TASK_NAME( REMOTE_NODE ),
          REMOTE_NODE,
@@ -135,5 +134,5 @@
       end if;
 
-      RTEMS.TASK_DELETE( REMOTE_TID, STATUS );
+      RTEMS.TASKS.DELETE( REMOTE_TID, STATUS );
       TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
          STATUS,
@@ -145,5 +144,5 @@
       );
           
-      RTEMS.TASK_START( REMOTE_TID, MPTEST.TEST_TASK'ACCESS, 0, STATUS );
+      RTEMS.TASKS.START( REMOTE_TID, MPTEST.TEST_TASK'ACCESS, 0, STATUS );
       TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
          STATUS,
@@ -155,5 +154,5 @@
       );
           
-      RTEMS.TASK_RESTART( REMOTE_TID, 0, STATUS );
+      RTEMS.TASKS.RESTART( REMOTE_TID, 0, STATUS );
       TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
          STATUS,
@@ -171,5 +170,5 @@
       UNSIGNED32_IO.PUT( RTEMS.GET_NODE( TID ), WIDTH=>1 );
       TEXT_IO.NEW_LINE;
-      RTEMS.TASK_SET_NOTE( 
+      RTEMS.TASKS.SET_NOTE( 
          REMOTE_TID, 
          RTEMS.GET_NODE( TID ),
@@ -180,5 +179,5 @@
 
       TEXT_IO.PUT_LINE( "Getting a notepad of the remote task" );
-      RTEMS.TASK_GET_NOTE( 
+      RTEMS.TASKS.GET_NOTE( 
          REMOTE_TID, 
          RTEMS.GET_NODE( TID ),
@@ -201,5 +200,5 @@
       end if;
 
-      RTEMS.TASK_DELETE( REMOTE_TID, STATUS );
+      RTEMS.TASKS.DELETE( REMOTE_TID, STATUS );
       TEXT_IO.PUT_LINE( "*** END OF TEST 2 ***" );
 
Index: c/src/ada-tests/mptests/mp02/mptest.ads
===================================================================
--- c/src/ada-tests/mptests/mp02/mptest.ads	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp02/mptest.ads	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 
 package MPTEST is
@@ -42,5 +43,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, INIT);
@@ -55,5 +56,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK);
Index: c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb
===================================================================
--- c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp02/node1/mp02_node1.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb
===================================================================
--- c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp02/node2/mp02_node2.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp03/mptest.adb
===================================================================
--- c/src/ada-tests/mptests/mp03/mptest.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp03/mptest.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -7,5 +7,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -19,4 +19,7 @@
 with INTERFACES; use INTERFACES;
 with RTEMS;
+with RTEMS.EVENT;
+with RTEMS.TASKS;
+with RTEMS.TIMER;
 with TEST_SUPPORT;
 with TEXT_IO;
@@ -25,5 +28,4 @@
 package body MPTEST is
 
---PAGE
 --
 --  INIT
@@ -31,5 +33,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS : RTEMS.STATUS_CODES;
@@ -48,5 +50,5 @@
 
       TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 
          1, 
@@ -60,5 +62,5 @@
 
       TEXT_IO.PUT_LINE( "Starting Test_task (Global)" );
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.TASK_ID( 1 ),
          MPTEST.TEST_TASK'ACCESS,
@@ -70,5 +72,5 @@
       MPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'M', '1', ' ' );
 
-      RTEMS.TIMER_CREATE( 
+      RTEMS.TIMER.CREATE( 
          MPTEST.TIMER_NAME( 1 ), 
          MPTEST.TIMER_ID( 1 ),
@@ -78,10 +80,9 @@
 
       TEXT_IO.PUT_LINE( "Deleting initialization task" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end INIT;
 
---PAGE
 --
 --  DELAYED_SEND_EVENT
@@ -95,10 +96,9 @@
    begin
 
-      RTEMS.EVENT_SEND( MPTEST.TASK_ID( 1 ), RTEMS.EVENT_16, STATUS );
+      RTEMS.EVENT.SEND( MPTEST.TASK_ID( 1 ), RTEMS.EVENT_16, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "EVENT_SEND" );
 
    end DELAYED_SEND_EVENT;
 
---PAGE
 --
 --  TEST_TASK
@@ -106,5 +106,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       TID         : RTEMS.ID;
@@ -112,5 +112,5 @@
    begin
 
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
+      RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
    
@@ -127,5 +127,5 @@
       loop
 
-         RTEMS.TASK_IDENT( 
+         RTEMS.TASKS.IDENT( 
             MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ),
             RTEMS.SEARCH_ALL_NODES,
@@ -138,5 +138,5 @@
       end loop;
 
-      RTEMS.TIMER_FIRE_AFTER( 
+      RTEMS.TIMER.FIRE_AFTER( 
          MPTEST.TIMER_ID( 1 ), 
          10 * TEST_SUPPORT.TICKS_PER_SECOND, 
@@ -149,5 +149,5 @@
       MPTEST.TEST_TASK_SUPPORT( 1 );
 
-      RTEMS.TIMER_FIRE_AFTER( 
+      RTEMS.TIMER.FIRE_AFTER( 
          MPTEST.TIMER_ID( 1 ), 
          11 * TEST_SUPPORT.TICKS_PER_SECOND, 
@@ -160,5 +160,5 @@
       if TEST_SUPPORT.NODE = 2 then
          
-         RTEMS.TASK_WAKE_AFTER( 
+         RTEMS.TASKS.WAKE_AFTER( 
             2 * TEST_SUPPORT.TICKS_PER_SECOND,
             STATUS
@@ -176,5 +176,4 @@
    end TEST_TASK;
 
---PAGE
 -- 
 --  TEST_TASK_SUPPORT
@@ -193,5 +192,5 @@
          loop
 
-            RTEMS.EVENT_RECEIVE( 
+            RTEMS.EVENT.RECEIVE( 
                RTEMS.EVENT_16,
                RTEMS.NO_WAIT,
@@ -209,5 +208,5 @@
             );
 
-            RTEMS.TASK_WAKE_AFTER( 
+            RTEMS.TASKS.WAKE_AFTER( 
                2 * TEST_SUPPORT.TICKS_PER_SECOND, 
                STATUS
@@ -217,8 +216,8 @@
             TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( NODE ), FALSE );
             TEXT_IO.PUT_LINE( " - Suspending remote task" );
-            RTEMS.TASK_SUSPEND( MPTEST.REMOTE_TID, STATUS );
+            RTEMS.TASKS.SUSPEND( MPTEST.REMOTE_TID, STATUS );
             TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SUSPEND" );
 
-            RTEMS.TASK_WAKE_AFTER( 
+            RTEMS.TASKS.WAKE_AFTER( 
                2 * TEST_SUPPORT.TICKS_PER_SECOND, 
                STATUS
@@ -229,5 +228,5 @@
             TEXT_IO.PUT_LINE( " - Resuming remote task" );
 
-            RTEMS.TASK_RESUME( MPTEST.REMOTE_TID, STATUS );
+            RTEMS.TASKS.RESUME( MPTEST.REMOTE_TID, STATUS );
             TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESUME" );
 
@@ -238,5 +237,5 @@
          loop
 
-            RTEMS.EVENT_RECEIVE( 
+            RTEMS.EVENT.RECEIVE( 
                RTEMS.EVENT_16,
                RTEMS.NO_WAIT,
@@ -256,5 +255,5 @@
             TEST_SUPPORT.PUT_NAME( MPTEST.TASK_NAME( REMOTE_NODE ), FALSE );
             TEXT_IO.PUT_LINE( " - have I been suspended???" ); 
-            RTEMS.TASK_WAKE_AFTER( 
+            RTEMS.TASKS.WAKE_AFTER( 
                TEST_SUPPORT.TICKS_PER_SECOND / 2,
                STATUS
Index: c/src/ada-tests/mptests/mp03/mptest.ads
===================================================================
--- c/src/ada-tests/mptests/mp03/mptest.ads	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp03/mptest.ads	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 
 package MPTEST is
@@ -64,5 +65,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, INIT);
@@ -92,5 +93,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK);
Index: c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb
===================================================================
--- c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp03/node1/mp03_node1.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb
===================================================================
--- c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp03/node2/mp03_node2.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp04/mptest.adb
===================================================================
--- c/src/ada-tests/mptests/mp04/mptest.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp04/mptest.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -23,4 +23,5 @@
 with INTERFACES; use INTERFACES;
 with RTEMS;
+with RTEMS.TASKS;
 with TEST_SUPPORT;
 with TEXT_IO;
@@ -29,5 +30,4 @@
 package body MPTEST is
 
---PAGE
 --
 --  INIT
@@ -35,5 +35,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS : RTEMS.STATUS_CODES;
@@ -53,5 +53,5 @@
       TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 
          TEST_SUPPORT.NODE, 
@@ -66,5 +66,5 @@
       TEXT_IO.PUT_LINE( "Starting Test_task (Global)" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.TASK_ID( 1 ),
          MPTEST.TEST_TASK'ACCESS,
@@ -76,10 +76,9 @@
       TEXT_IO.PUT_LINE( "Deleting initialization task" );
 
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end INIT;
 
---PAGE
 --
 --  TEST_TASK
@@ -87,13 +86,13 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       TID                 : RTEMS.ID;
-      PREVIOUS_PRIORITY   : RTEMS.TASK_PRIORITY;
-      PREVIOUS_PRIORITY_1 : RTEMS.TASK_PRIORITY;
+      PREVIOUS_PRIORITY   : RTEMS.TASKS.PRIORITY;
+      PREVIOUS_PRIORITY_1 : RTEMS.TASKS.PRIORITY;
       STATUS              : RTEMS.STATUS_CODES;
    begin
 
-      RTEMS.TASK_IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
+      RTEMS.TASKS.IDENT( RTEMS.SELF, RTEMS.SEARCH_ALL_NODES, TID, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_IDENT OF SELF" );
    
@@ -110,5 +109,5 @@
       loop
 
-         RTEMS.TASK_IDENT( 
+         RTEMS.TASKS.IDENT( 
             MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ),
             RTEMS.SEARCH_ALL_NODES,
@@ -121,5 +120,5 @@
       end loop;
 
-      RTEMS.TASK_SET_PRIORITY(
+      RTEMS.TASKS.SET_PRIORITY(
          MPTEST.REMOTE_TID,
          TEST_SUPPORT.NODE,
@@ -143,7 +142,7 @@
       loop
 
-         RTEMS.TASK_SET_PRIORITY(
+         RTEMS.TASKS.SET_PRIORITY(
             RTEMS.SELF,
-            RTEMS.CURRENT_PRIORITY,
+            RTEMS.TASKS.CURRENT_PRIORITY,
             PREVIOUS_PRIORITY_1,
             STATUS
Index: c/src/ada-tests/mptests/mp04/mptest.ads
===================================================================
--- c/src/ada-tests/mptests/mp04/mptest.ads	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp04/mptest.ads	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 
 package MPTEST is
@@ -56,5 +57,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, INIT);
@@ -69,5 +70,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK);
Index: c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb
===================================================================
--- c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp04/node1/mp04_node1.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb
===================================================================
--- c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp04/node2/mp04_node2.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp05/mptest.adb
===================================================================
--- c/src/ada-tests/mptests/mp05/mptest.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp05/mptest.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -23,4 +23,8 @@
 with INTERFACES; use INTERFACES;
 with RTEMS;
+with RTEMS.FATAL;
+with RTEMS.SIGNAL;
+with RTEMS.TASKS;
+with RTEMS.TIMER;
 with TEST_SUPPORT;
 with TEXT_IO;
@@ -29,5 +33,4 @@
 package body MPTEST is
 
---PAGE
 --
 --  INIT
@@ -35,5 +38,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS : RTEMS.STATUS_CODES;
@@ -53,5 +56,5 @@
       TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 
          1,
@@ -66,5 +69,5 @@
       TEXT_IO.PUT_LINE( "Starting Test_task (Global)" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.TASK_ID( 1 ),
          MPTEST.TEST_TASK'ACCESS,
@@ -77,5 +80,5 @@
       MPTEST.TIMER_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'M', '2', ' ' );
 
-      RTEMS.TIMER_CREATE(
+      RTEMS.TIMER.CREATE(
          MPTEST.TIMER_NAME( TEST_SUPPORT.NODE ),
          MPTEST.TIMER_ID( 1 ),
@@ -86,10 +89,9 @@
       TEXT_IO.PUT_LINE( "Deleting initialization task" );
 
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end INIT;
 
---PAGE
 --
 --  PROCESS_ASR
@@ -110,5 +112,5 @@
          TEXT_IO.NEW_LINE;
 
-         RTEMS.FATAL_ERROR_OCCURRED( 16#000F_0000# );
+         RTEMS.FATAL.ERROR_OCCURRED( 16#000F_0000# );
 
       end if;
@@ -118,5 +120,4 @@
    end PROCESS_ASR;
 
---PAGE
 --
 --  STOP_TEST_TSR
@@ -133,5 +134,4 @@
    end STOP_TEST_TSR;
 
---PAGE
 --
 --  TEST_TASK
@@ -139,5 +139,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS  : RTEMS.STATUS_CODES;
@@ -150,5 +150,5 @@
 
       TEXT_IO.PUT_LINE( "signal_catch: initializing signal catcher" );
-      RTEMS.SIGNAL_CATCH( 
+      RTEMS.SIGNAL.CATCH( 
          MPTEST.PROCESS_ASR'ACCESS, 
          RTEMS.NO_ASR + RTEMS.NO_PREEMPT,
@@ -173,5 +173,5 @@
       loop
 
-         RTEMS.TASK_IDENT( 
+         RTEMS.TASKS.IDENT( 
             MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ),
             RTEMS.SEARCH_ALL_NODES,
@@ -184,5 +184,5 @@
       end loop;
 
-      RTEMS.TIMER_FIRE_AFTER(
+      RTEMS.TIMER.FIRE_AFTER(
          MPTEST.TIMER_ID( 1 ),
          3 * TEST_SUPPORT.TICKS_PER_SECOND,
@@ -197,5 +197,5 @@
          TEXT_IO.PUT_LINE( "Sending signal to remote task" );
          loop
-            RTEMS.SIGNAL_SEND(
+            RTEMS.SIGNAL.SEND(
                MPTEST.REMOTE_TID,
                MPTEST.REMOTE_SIGNAL,
@@ -229,5 +229,5 @@
             end if;
 
-            RTEMS.SIGNAL_SEND(
+            RTEMS.SIGNAL.SEND(
                MPTEST.REMOTE_TID,
                MPTEST.REMOTE_SIGNAL,
Index: c/src/ada-tests/mptests/mp05/mptest.ads
===================================================================
--- c/src/ada-tests/mptests/mp05/mptest.ads	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp05/mptest.ads	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,6 @@
 
 with RTEMS;
+with RTEMS.SIGNAL;
+with RTEMS.TASKS;
 
 package MPTEST is
@@ -96,5 +98,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, INIT);
@@ -136,5 +138,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK);
Index: c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb
===================================================================
--- c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp05/node1/mp05_node1.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb
===================================================================
--- c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp05/node2/mp05_node2.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp06/mptest.adb
===================================================================
--- c/src/ada-tests/mptests/mp06/mptest.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp06/mptest.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -23,4 +23,7 @@
 with INTERFACES; use INTERFACES;
 with RTEMS;
+with RTEMS.EVENT;
+with RTEMS.TASKS;
+with RTEMS.TIMER;
 with TEST_SUPPORT;
 with TEXT_IO;
@@ -29,5 +32,4 @@
 package body MPTEST is
 
---PAGE
 --
 --  INIT
@@ -35,5 +37,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS : RTEMS.STATUS_CODES;
@@ -53,5 +55,5 @@
       TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
 
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 
          TEST_SUPPORT.NODE, 
@@ -66,5 +68,5 @@
       TEXT_IO.PUT_LINE( "Starting Test_task (Global)" );
 
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.TASK_ID( 1 ),
          MPTEST.TEST_TASK'ACCESS,
@@ -77,5 +79,5 @@
       MPTEST.TIMER_NAME( 2 ) := RTEMS.BUILD_NAME(  'T', 'M', '2', ' ' );
 
-      RTEMS.TIMER_CREATE(
+      RTEMS.TIMER.CREATE(
          MPTEST.TIMER_NAME( TEST_SUPPORT.NODE ),
          MPTEST.TIMER_ID( 1 ),
@@ -86,10 +88,9 @@
       TEXT_IO.PUT_LINE( "Deleting initialization task" );
 
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end INIT;
 
---PAGE
 --
 --  STOP_TEST_TSR
@@ -106,5 +107,4 @@
    end STOP_TEST_TSR;
  
---PAGE
 --
 --  TEST_TASK
@@ -112,5 +112,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       COUNT                    : RTEMS.UNSIGNED32;
@@ -135,5 +135,5 @@
       loop
 
-         RTEMS.TASK_IDENT( 
+         RTEMS.TASKS.IDENT( 
             MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ),
             RTEMS.SEARCH_ALL_NODES,
@@ -152,5 +152,5 @@
       end if;
 
-      RTEMS.TIMER_FIRE_AFTER(
+      RTEMS.TIMER.FIRE_AFTER(
          MPTEST.TIMER_ID( 1 ),
          5 * TEST_SUPPORT.TICKS_PER_SECOND,
@@ -174,5 +174,5 @@
          if TEST_SUPPORT.NODE = 1 then
 
-            RTEMS.EVENT_SEND( 
+            RTEMS.EVENT.SEND( 
                MPTEST.REMOTE_TID,
                EVENT_FOR_THIS_ITERATION,
@@ -183,5 +183,5 @@
          else
 
-            RTEMS.EVENT_RECEIVE( 
+            RTEMS.EVENT.RECEIVE( 
                EVENT_FOR_THIS_ITERATION,
                RTEMS.DEFAULT_OPTIONS,
@@ -228,5 +228,5 @@
       if TEST_SUPPORT.NODE = 2 then
 
-         RTEMS.EVENT_RECEIVE( 
+         RTEMS.EVENT.RECEIVE( 
             RTEMS.EVENT_16,
             RTEMS.DEFAULT_OPTIONS,
Index: c/src/ada-tests/mptests/mp06/mptest.ads
===================================================================
--- c/src/ada-tests/mptests/mp06/mptest.ads	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp06/mptest.ads	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,6 @@
 
 with RTEMS;
+with RTEMS.EVENT;
+with RTEMS.TASKS;
 
 package MPTEST is
@@ -115,5 +117,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, INIT);
@@ -142,5 +144,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK);
Index: c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb
===================================================================
--- c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp06/node1/mp06_node1.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb
===================================================================
--- c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp06/node2/mp06_node2.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp07/mptest.adb
===================================================================
--- c/src/ada-tests/mptests/mp07/mptest.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp07/mptest.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -23,4 +23,7 @@
 with INTERFACES; use INTERFACES;
 with RTEMS;
+with RTEMS.EVENT;
+with RTEMS.TASKS;
+with RTEMS.TIMER;
 with TEST_SUPPORT;
 with TEXT_IO;
@@ -29,5 +32,4 @@
 package body MPTEST is
 
---PAGE
 --
 --  INIT
@@ -35,5 +37,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS : RTEMS.STATUS_CODES;
@@ -52,5 +54,5 @@
 
       TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 
          TEST_SUPPORT.NODE, 
@@ -64,5 +66,5 @@
 
       TEXT_IO.PUT_LINE( "Starting Test_task (Global)" );
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.TASK_ID( 1 ),
          MPTEST.TEST_TASK'ACCESS,
@@ -74,5 +76,5 @@
       MPTEST.TIMER_NAME( 1 ) := RTEMS.BUILD_NAME(  'T', 'M', '1', ' ' );
 
-      RTEMS.TIMER_CREATE(
+      RTEMS.TIMER.CREATE(
          MPTEST.TIMER_NAME( 1 ),
          MPTEST.TIMER_ID( 1 ),
@@ -82,10 +84,9 @@
 
       TEXT_IO.PUT_LINE( "Deleting initialization task" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end INIT;
 
---PAGE
 --
 --  STOP_TEST_TSR
@@ -102,5 +103,4 @@
    end STOP_TEST_TSR;
  
---PAGE
 --
 --  TEST_TASK
@@ -108,5 +108,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       EVENT_OUT : RTEMS.EVENT_SET;
@@ -127,5 +127,5 @@
       TEXT_IO.PUT_LINE( "Getting TID of remote task" );
       loop
-         RTEMS.TASK_IDENT( 
+         RTEMS.TASKS.IDENT( 
             MPTEST.TASK_NAME( MPTEST.REMOTE_NODE ),
             RTEMS.SEARCH_ALL_NODES,
@@ -141,5 +141,5 @@
 
          TEXT_IO.PUT_LINE( "Sending first event to remote task" );
-         RTEMS.EVENT_SEND( 
+         RTEMS.EVENT.SEND( 
             MPTEST.REMOTE_TID,
             RTEMS.EVENT_16,
@@ -150,5 +150,5 @@
       end if;
 
-      RTEMS.TIMER_FIRE_AFTER(
+      RTEMS.TIMER.FIRE_AFTER(
          MPTEST.TIMER_ID( 1 ),
          5 * TEST_SUPPORT.TICKS_PER_SECOND,
@@ -166,5 +166,5 @@
          loop
 
-            RTEMS.EVENT_RECEIVE( 
+            RTEMS.EVENT.RECEIVE( 
                RTEMS.EVENT_16,
                RTEMS.DEFAULT_OPTIONS,
@@ -183,5 +183,5 @@
             end if;
 
-            RTEMS.EVENT_SEND( 
+            RTEMS.EVENT.SEND( 
                MPTEST.REMOTE_TID,
                RTEMS.EVENT_16,
Index: c/src/ada-tests/mptests/mp07/mptest.ads
===================================================================
--- c/src/ada-tests/mptests/mp07/mptest.ads	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp07/mptest.ads	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 
 package MPTEST is
@@ -75,5 +76,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, INIT);
@@ -102,5 +103,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK);
Index: c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb
===================================================================
--- c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp07/node1/mp07_node1.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb
===================================================================
--- c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp07/node2/mp07_node2.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp08/mptest.adb
===================================================================
--- c/src/ada-tests/mptests/mp08/mptest.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp08/mptest.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -23,4 +23,7 @@
 with INTERFACES; use INTERFACES;
 with RTEMS;
+with RTEMS.OBJECT;
+with RTEMS.SEMAPHORE;
+with RTEMS.TASKS;
 with TEST_SUPPORT;
 with TEXT_IO;
@@ -29,5 +32,4 @@
 package body MPTEST is
 
---PAGE
 --
 --  INIT
@@ -35,5 +37,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS : RTEMS.STATUS_CODES;
@@ -57,5 +59,5 @@
          TEXT_IO.PUT_LINE( "Creating Semaphore(Global)" );
 
-         RTEMS.SEMAPHORE_CREATE(
+         RTEMS.SEMAPHORE.CREATE(
             MPTEST.SEMAPHORE_NAME( 1 ),
             1,
@@ -69,5 +71,5 @@
 
       TEXT_IO.PUT_LINE( "Creating Test_task (Global)" );
-      RTEMS.TASK_CREATE( 
+      RTEMS.TASKS.CREATE( 
          MPTEST.TASK_NAME( TEST_SUPPORT.NODE ), 
          TEST_SUPPORT.NODE, 
@@ -81,5 +83,5 @@
 
       TEXT_IO.PUT_LINE( "Starting Test_task (Global)" );
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.TASK_ID( 1 ),
          MPTEST.TEST_TASK'ACCESS,
@@ -90,10 +92,9 @@
 
       TEXT_IO.PUT_LINE( "Deleting initialization task" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end INIT;
 
---PAGE
 --
 --  TEST_TASK
@@ -101,5 +102,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       DOTS                     : RTEMS.UNSIGNED32;
@@ -111,5 +112,5 @@
       loop
 
-         RTEMS.SEMAPHORE_IDENT( 
+         RTEMS.SEMAPHORE.IDENT( 
             MPTEST.SEMAPHORE_NAME( 1 ),
             RTEMS.SEARCH_ALL_NODES,
@@ -124,5 +125,5 @@
       if TEST_SUPPORT.NODE = 2 then
 
-         RTEMS.SEMAPHORE_DELETE(
+         RTEMS.SEMAPHORE.DELETE(
             MPTEST.SEMAPHORE_ID( 1 ),
             STATUS
@@ -146,5 +147,5 @@
          TEST_SUPPORT.PUT_DOT( "p" );
 
-         RTEMS.SEMAPHORE_OBTAIN(
+         RTEMS.SEMAPHORE.OBTAIN(
             MPTEST.SEMAPHORE_ID( 1 ),
             RTEMS.DEFAULT_OPTIONS,
@@ -176,5 +177,5 @@
             COUNT >= 1000 then
 
-            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" );
 
@@ -183,5 +184,5 @@
             TEXT_IO.PUT_LINE( "Deleting global semaphore" );
 
-            RTEMS.SEMAPHORE_DELETE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
+            RTEMS.SEMAPHORE.DELETE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
             TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_DELETE" );
 
@@ -194,5 +195,5 @@
          TEST_SUPPORT.PUT_DOT( "v" );
 
-         RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
+         RTEMS.SEMAPHORE.RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
 
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" );
Index: c/src/ada-tests/mptests/mp08/mptest.ads
===================================================================
--- c/src/ada-tests/mptests/mp08/mptest.ads	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp08/mptest.ads	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 
 package MPTEST is
@@ -70,5 +71,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, INIT);
@@ -83,5 +84,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK);
Index: c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb
===================================================================
--- c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp08/node1/mp08_node1.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb
===================================================================
--- c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp08/node2/mp08_node2.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp09/mptest.adb
===================================================================
--- c/src/ada-tests/mptests/mp09/mptest.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp09/mptest.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -23,4 +23,7 @@
 with INTERFACES; use INTERFACES;
 with RTEMS;
+with RTEMS.MESSAGE_QUEUE;
+with RTEMS.OBJECT;
+with RTEMS.TASKS;
 with TEST_SUPPORT;
 with TEXT_IO;
@@ -29,5 +32,4 @@
 package body MPTEST is
 
---PAGE
 --
 --  INIT
@@ -35,5 +37,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS : RTEMS.STATUS_CODES;
@@ -76,5 +78,5 @@
 
          TEXT_IO.PUT_LINE( "Creating Message Queue (Global)" );
-         RTEMS.MESSAGE_QUEUE_CREATE(
+         RTEMS.MESSAGE_QUEUE.CREATE(
             MPTEST.QUEUE_NAME( 1 ),
             3,
@@ -88,5 +90,5 @@
 
       TEXT_IO.PUT_LINE( "Creating Test_task (local)" );
-      RTEMS.TASK_CREATE(
+      RTEMS.TASKS.CREATE(
          MPTEST.TASK_NAME( TEST_SUPPORT.NODE ),
          TEST_SUPPORT.NODE,
@@ -100,5 +102,5 @@
 
       TEXT_IO.PUT_LINE( "Starting Test_task (local)" );
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.TASK_ID( 1 ),
          MPTEST.TEST_TASK'ACCESS,
@@ -109,10 +111,9 @@
 
       TEXT_IO.PUT_LINE( "Deleting initialization task" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end INIT;
 
---PAGE
 --
 --  SEND_MESSAGES
@@ -128,5 +129,5 @@
       TEXT_IO.NEW_LINE;
 
-      RTEMS.MESSAGE_QUEUE_SEND(
+      RTEMS.MESSAGE_QUEUE.SEND(
          MPTEST.QUEUE_ID( 1 ),
          MPTEST.BUFFER_1,
@@ -136,5 +137,5 @@
 
       TEXT_IO.PUT_LINE( "Delaying for a second" );
-      RTEMS.TASK_WAKE_AFTER(
+      RTEMS.TASKS.WAKE_AFTER(
          1 * TEST_SUPPORT.TICKS_PER_SECOND,
          STATUS
@@ -146,5 +147,5 @@
       TEXT_IO.NEW_LINE;
 
-      RTEMS.MESSAGE_QUEUE_URGENT(
+      RTEMS.MESSAGE_QUEUE.URGENT(
          MPTEST.QUEUE_ID( 1 ),
          MPTEST.BUFFER_2,
@@ -154,5 +155,5 @@
 
       TEXT_IO.PUT_LINE( "Delaying for a second" );
-      RTEMS.TASK_WAKE_AFTER(
+      RTEMS.TASKS.WAKE_AFTER(
          1 * TEST_SUPPORT.TICKS_PER_SECOND,
          STATUS
@@ -164,5 +165,5 @@
       TEXT_IO.NEW_LINE;
 
-      RTEMS.MESSAGE_QUEUE_BROADCAST(
+      RTEMS.MESSAGE_QUEUE.BROADCAST(
          MPTEST.QUEUE_ID( 1 ),
          MPTEST.BUFFER_3,
@@ -173,5 +174,5 @@
 
       TEXT_IO.PUT_LINE( "Delaying for a second" );
-      RTEMS.TASK_WAKE_AFTER(
+      RTEMS.TASKS.WAKE_AFTER(
          1 * TEST_SUPPORT.TICKS_PER_SECOND,
          STATUS
@@ -181,5 +182,4 @@
    end SEND_MESSAGES;
 
---PAGE
 --
 --  RECEIVE_MESSAGES
@@ -195,5 +195,5 @@
 
          TEXT_IO.PUT_LINE( "Receiving message ..." );
-         RTEMS.MESSAGE_QUEUE_RECEIVE(
+         RTEMS.MESSAGE_QUEUE.RECEIVE(
             MPTEST.QUEUE_ID( 1 ),
             MPTEST.RECEIVE_BUFFER,
@@ -212,10 +212,9 @@
       TEXT_IO.PUT_LINE( "Receiver delaying for a second" );
 
-      RTEMS.TASK_WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+      RTEMS.TASKS.WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
 
    end RECEIVE_MESSAGES;
 
---PAGE
 --
 --  FILL_BUFFER
@@ -244,5 +243,4 @@
    end FILL_BUFFER;
 
---PAGE
 --
 --  PUT_BUFFER
@@ -265,5 +263,4 @@
    end PUT_BUFFER;
 
---PAGE
 --
 --  TEST_TASK
@@ -271,5 +268,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       COUNT   : RTEMS.UNSIGNED32;
@@ -277,5 +274,5 @@
    begin
 
-      RTEMS.TASK_WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+      RTEMS.TASKS.WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
 
@@ -284,5 +281,5 @@
       loop
 
-         RTEMS.MESSAGE_QUEUE_IDENT(
+         RTEMS.MESSAGE_QUEUE.IDENT(
             MPTEST.QUEUE_NAME( 1 ),
             RTEMS.SEARCH_ALL_NODES,
@@ -297,5 +294,5 @@
       if TEST_SUPPORT.NODE = 2 then
 
-         RTEMS.MESSAGE_QUEUE_DELETE( MPTEST.QUEUE_ID( 1 ), STATUS );
+         RTEMS.MESSAGE_QUEUE.DELETE( MPTEST.QUEUE_ID( 1 ), STATUS );
 
          TEST_SUPPORT.FATAL_DIRECTIVE_STATUS(
@@ -314,5 +311,5 @@
 
          TEXT_IO.PUT_LINE( "Flushing remote empty queue" );
-         RTEMS.MESSAGE_QUEUE_FLUSH( MPTEST.QUEUE_ID( 1 ), COUNT, STATUS );
+         RTEMS.MESSAGE_QUEUE.FLUSH( MPTEST.QUEUE_ID( 1 ), COUNT, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_FLUSH" );
          UNSIGNED32_IO.PUT( COUNT, WIDTH => 1 );
@@ -324,5 +321,5 @@
             "Send messages to be flushed from remote queue"
          );
-         RTEMS.MESSAGE_QUEUE_SEND(
+         RTEMS.MESSAGE_QUEUE.SEND(
             MPTEST.QUEUE_ID( 1 ),
             MPTEST.BUFFER_1,
@@ -332,5 +329,5 @@
 
          TEXT_IO.PUT_LINE( "Flushing remote queue" );
-         RTEMS.MESSAGE_QUEUE_FLUSH( MPTEST.QUEUE_ID( 1 ), COUNT, STATUS );
+         RTEMS.MESSAGE_QUEUE.FLUSH( MPTEST.QUEUE_ID( 1 ), COUNT, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_FLUSH" );
          UNSIGNED32_IO.PUT( COUNT, WIDTH => 1 );
@@ -340,5 +337,5 @@
 
          TEXT_IO.PUT_LINE( "Waiting for message queue to be deleted" );
-         RTEMS.MESSAGE_QUEUE_RECEIVE(
+         RTEMS.MESSAGE_QUEUE.RECEIVE(
             MPTEST.QUEUE_ID( 1 ),
             MPTEST.RECEIVE_BUFFER,
@@ -359,5 +356,5 @@
          MPTEST.SEND_MESSAGES;
 
-         RTEMS.TASK_WAKE_AFTER(
+         RTEMS.TASKS.WAKE_AFTER(
             5 * TEST_SUPPORT.TICKS_PER_SECOND,
             STATUS
@@ -365,5 +362,5 @@
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
 
-         RTEMS.MESSAGE_QUEUE_DELETE( MPTEST.QUEUE_ID( 1 ), STATUS );
+         RTEMS.MESSAGE_QUEUE.DELETE( MPTEST.QUEUE_ID( 1 ), STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "MESSAGE_QUEUE_DELETE" );
 
Index: c/src/ada-tests/mptests/mp09/mptest.ads
===================================================================
--- c/src/ada-tests/mptests/mp09/mptest.ads	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp09/mptest.ads	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 
 package MPTEST is
@@ -87,5 +88,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, INIT);
@@ -145,5 +146,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK);
Index: c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb
===================================================================
--- c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp09/node1/mp09_node1.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb
===================================================================
--- c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp09/node2/mp09_node2.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp10/mptest.adb
===================================================================
--- c/src/ada-tests/mptests/mp10/mptest.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp10/mptest.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -23,4 +23,7 @@
 with INTERFACES; use INTERFACES;
 with RTEMS;
+with RTEMS.MESSAGE_QUEUE;
+with RTEMS.SEMAPHORE;
+with RTEMS.TASKS;
 with TEST_SUPPORT;
 with TEXT_IO;
@@ -29,5 +32,4 @@
 package body MPTEST is
 
---PAGE
 --
 --  INIT
@@ -35,5 +37,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS : RTEMS.STATUS_CODES;
@@ -60,5 +62,5 @@
 
          TEXT_IO.PUT_LINE( "Creating Message Queue (Global)" );
-         RTEMS.MESSAGE_QUEUE_CREATE(
+         RTEMS.MESSAGE_QUEUE.CREATE(
             MPTEST.QUEUE_NAME( 1 ),
             3,
@@ -70,5 +72,5 @@
 
          TEXT_IO.PUT_LINE( "Creating Semaphore (Global)" );
-         RTEMS.SEMAPHORE_CREATE(
+         RTEMS.SEMAPHORE.CREATE(
             MPTEST.SEMAPHORE_NAME( 1 ),
             0,
@@ -79,5 +81,5 @@
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" );
 
-         RTEMS.TASK_WAKE_AFTER( 10 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+         RTEMS.TASKS.WAKE_AFTER( 10 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
 
@@ -85,5 +87,5 @@
 
          TEXT_IO.PUT_LINE( "Creating Test_task 1 (local)" );
-         RTEMS.TASK_CREATE(
+         RTEMS.TASKS.CREATE(
             MPTEST.TASK_NAME( 1 ),
             1,
@@ -97,5 +99,5 @@
 
          TEXT_IO.PUT_LINE( "Starting Test_task 1 (local)" );
-         RTEMS.TASK_START(
+         RTEMS.TASKS.START(
             MPTEST.TASK_ID( 1 ),
             MPTEST.TEST_TASK_1'ACCESS,
@@ -106,5 +108,5 @@
 
          TEXT_IO.PUT_LINE( "Creating Test_task 2 (local)" );
-         RTEMS.TASK_CREATE(
+         RTEMS.TASKS.CREATE(
             MPTEST.TASK_NAME( 2 ),
             1,
@@ -118,5 +120,5 @@
  
          TEXT_IO.PUT_LINE( "Starting Test_task 2 (local)" );
-         RTEMS.TASK_START(
+         RTEMS.TASKS.START(
             MPTEST.TASK_ID( 2 ),
             MPTEST.TEST_TASK_2'ACCESS,
@@ -127,5 +129,5 @@
 
          TEXT_IO.PUT_LINE( "Creating Test_task 3 (local)" );
-         RTEMS.TASK_CREATE(
+         RTEMS.TASKS.CREATE(
             MPTEST.TASK_NAME( 3 ),
             1,
@@ -139,5 +141,5 @@
  
          TEXT_IO.PUT_LINE( "Starting Test_task 3 (local)" );
-         RTEMS.TASK_START(
+         RTEMS.TASKS.START(
             MPTEST.TASK_ID( 3 ),
             MPTEST.TEST_TASK_3'ACCESS,
@@ -148,17 +150,17 @@
 
          TEXT_IO.PUT_LINE( "Sleeping for 1 second ..." );
-         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" );
 
          TEXT_IO.PUT_LINE( "Deleting Test_task 2" );
-         RTEMS.TASK_DELETE( MPTEST.TASK_ID( 2 ), STATUS );
+         RTEMS.TASKS.DELETE( MPTEST.TASK_ID( 2 ), STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF 2" );
 
          TEXT_IO.PUT_LINE( "Deleting Test_task 1" );
-         RTEMS.TASK_DELETE( MPTEST.TASK_ID( 1 ), STATUS );
+         RTEMS.TASKS.DELETE( MPTEST.TASK_ID( 1 ), STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF 1" );
 
          TEXT_IO.PUT_LINE( "Restarting Test_task 3" );
-         RTEMS.TASK_RESTART( MPTEST.TASK_ID( 3 ), 1, STATUS );
+         RTEMS.TASKS.RESTART( MPTEST.TASK_ID( 3 ), 1, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_RESTART OF 3" );
 
@@ -171,5 +173,4 @@
    end INIT;
 
---PAGE
 --
 --  TEST_TASK_1
@@ -177,5 +178,5 @@
 
    procedure TEST_TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       COUNT               : RTEMS.UNSIGNED32;
@@ -192,5 +193,5 @@
       loop
 
-         RTEMS.MESSAGE_QUEUE_IDENT(
+         RTEMS.MESSAGE_QUEUE.IDENT(
             MPTEST.QUEUE_NAME( 1 ),
             RTEMS.SEARCH_ALL_NODES,
@@ -204,5 +205,5 @@
 
       TEXT_IO.PUT_LINE( "Attempting to receive message ..." );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
+      RTEMS.MESSAGE_QUEUE.RECEIVE(
          MPTEST.QUEUE_ID( 1 ),
          RECEIVE_BUFFER,
@@ -215,5 +216,4 @@
    end TEST_TASK_1;
 
---PAGE
 --
 --  TEST_TASK_2
@@ -221,5 +221,5 @@
  
    procedure TEST_TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS : RTEMS.STATUS_CODES;
@@ -230,5 +230,5 @@
       loop
 
-         RTEMS.SEMAPHORE_IDENT(
+         RTEMS.SEMAPHORE.IDENT(
             MPTEST.SEMAPHORE_NAME( 1 ),
             RTEMS.SEARCH_ALL_NODES,
@@ -242,5 +242,5 @@
 
       TEXT_IO.PUT_LINE( "Attempting to acquire semaphore ..." );
-      RTEMS.SEMAPHORE_OBTAIN(
+      RTEMS.SEMAPHORE.OBTAIN(
          MPTEST.SEMAPHORE_ID( 1 ),
          RTEMS.DEFAULT_OPTIONS,
@@ -252,5 +252,4 @@
    end TEST_TASK_2;
 
---PAGE 
 -- 
 --  TEST_TASK_3
@@ -258,5 +257,5 @@
   
    procedure TEST_TASK_3 ( 
-      RESTART : in     RTEMS.TASK_ARGUMENT 
+      RESTART : in     RTEMS.TASKS.ARGUMENT 
    ) is 
       STATUS : RTEMS.STATUS_CODES;
@@ -265,5 +264,5 @@
       if RESTART = 1 then
 
-         RTEMS.TASK_DELETE( RTEMS.SELF, STATUS ); 
+         RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS ); 
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE" );
 
@@ -274,5 +273,5 @@
       loop
 
-         RTEMS.SEMAPHORE_IDENT(
+         RTEMS.SEMAPHORE.IDENT(
             MPTEST.SEMAPHORE_NAME( 1 ),
             RTEMS.SEARCH_ALL_NODES,
@@ -286,5 +285,5 @@
 
       TEXT_IO.PUT_LINE( "Attempting to acquire semaphore ..." );
-      RTEMS.SEMAPHORE_OBTAIN(
+      RTEMS.SEMAPHORE.OBTAIN(
          MPTEST.SEMAPHORE_ID( 1 ),
          RTEMS.DEFAULT_OPTIONS,
Index: c/src/ada-tests/mptests/mp10/mptest.ads
===================================================================
--- c/src/ada-tests/mptests/mp10/mptest.ads	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp10/mptest.ads	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 
 package MPTEST is
@@ -78,5 +79,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, INIT);
@@ -91,5 +92,5 @@
 
    procedure TEST_TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK_1);
@@ -104,5 +105,5 @@
  
    procedure TEST_TASK_2 ( 
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK_2);
@@ -117,5 +118,5 @@
  
    procedure TEST_TASK_3 ( 
-      RESTART : in     RTEMS.TASK_ARGUMENT
+      RESTART : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK_3);
Index: c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb
===================================================================
--- c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp10/node1/mp10_node1.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb
===================================================================
--- c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp10/node2/mp10_node2.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp11/mptest.adb
===================================================================
--- c/src/ada-tests/mptests/mp11/mptest.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp11/mptest.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -23,4 +23,8 @@
 with INTERFACES; use INTERFACES;
 with RTEMS;
+with RTEMS.MESSAGE_QUEUE;
+with RTEMS.PARTITION;
+with RTEMS.SEMAPHORE;
+with RTEMS.TASKS;
 with TEST_SUPPORT;
 with TEXT_IO;
@@ -29,5 +33,4 @@
 package body MPTEST is
 
---PAGE
 --
 --  INIT
@@ -35,5 +38,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS : RTEMS.STATUS_CODES;
@@ -60,5 +63,5 @@
 
          TEXT_IO.PUT_LINE( "Attempting to create Test_task (Global)" );
-         RTEMS.TASK_CREATE(
+         RTEMS.TASKS.CREATE(
             MPTEST.TASK_NAME( 1 ),
             1,
@@ -77,5 +80,5 @@
 
          TEXT_IO.PUT_LINE( "Attempting to create Message Queue (Global)" );
-         RTEMS.MESSAGE_QUEUE_CREATE(
+         RTEMS.MESSAGE_QUEUE.CREATE(
             MPTEST.QUEUE_NAME( 1 ),
             3,
@@ -94,5 +97,5 @@
 
          TEXT_IO.PUT_LINE( "Creating Semaphore (Global)" );
-         RTEMS.SEMAPHORE_CREATE(
+         RTEMS.SEMAPHORE.CREATE(
             MPTEST.SEMAPHORE_NAME( 1 ),
             1,
@@ -109,5 +112,5 @@
 
          TEXT_IO.PUT_LINE( "Creating Partition (Global)" );
-         RTEMS.PARTITION_CREATE(
+         RTEMS.PARTITION.CREATE(
             MPTEST.PARTITION_NAME( 1 ),
             MPTEST.PARTITION_AREA( 0 )'ADDRESS,
Index: c/src/ada-tests/mptests/mp11/mptest.ads
===================================================================
--- c/src/ada-tests/mptests/mp11/mptest.ads	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp11/mptest.ads	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 
 package MPTEST is
@@ -74,5 +75,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, INIT);
Index: c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb
===================================================================
--- c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp11/node1/mp11_node1.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb
===================================================================
--- c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp11/node2/mp11_node2.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp12/mptest.adb
===================================================================
--- c/src/ada-tests/mptests/mp12/mptest.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp12/mptest.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -23,4 +23,6 @@
 with INTERFACES; use INTERFACES;
 with RTEMS;
+with RTEMS.PARTITION;
+with RTEMS.TASKS;
 with TEST_SUPPORT;
 with TEXT_IO;
@@ -29,5 +31,4 @@
 package body MPTEST is
 
---PAGE
 --
 --  INIT
@@ -35,5 +36,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       BUFFER_ADDRESS : RTEMS.ADDRESS;
@@ -58,5 +59,5 @@
       if TEST_SUPPORT.NODE = 2 then
 
-         RTEMS.TASK_WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+         RTEMS.TASKS.WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
 
@@ -65,5 +66,5 @@
          loop
 
-            RTEMS.PARTITION_IDENT(
+            RTEMS.PARTITION.IDENT(
                MPTEST.PARTITION_NAME( 1 ),
                RTEMS.SEARCH_ALL_NODES,
@@ -80,5 +81,5 @@
          );
 
-         RTEMS.PARTITION_DELETE( MPTEST.PARTITION_ID( 1 ), STATUS ); 
+         RTEMS.PARTITION.DELETE( MPTEST.PARTITION_ID( 1 ), STATUS ); 
          TEST_SUPPORT.FATAL_DIRECTIVE_STATUS( 
             STATUS, 
@@ -93,5 +94,5 @@
          TEXT_IO.PUT_LINE( "Obtaining a buffer from the global partition" );
 
-         RTEMS.PARTITION_GET_BUFFER(
+         RTEMS.PARTITION.GET_BUFFER(
             MPTEST.PARTITION_ID( 1 ),
             BUFFER_ADDRESS,
@@ -107,5 +108,5 @@
          TEXT_IO.NEW_LINE;
 
-         RTEMS.PARTITION_RETURN_BUFFER(
+         RTEMS.PARTITION.RETURN_BUFFER(
             MPTEST.PARTITION_ID( 1 ),
             BUFFER_ADDRESS,
@@ -114,5 +115,5 @@
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_RETURN_BUFFER" );
 
-         RTEMS.TASK_WAKE_AFTER( 2 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+         RTEMS.TASKS.WAKE_AFTER( 2 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
 
@@ -120,5 +121,5 @@
 
          TEXT_IO.PUT_LINE( "Creating Partition (Global)" );
-         RTEMS.PARTITION_CREATE(
+         RTEMS.PARTITION.CREATE(
             MPTEST.PARTITION_NAME( 1 ),
             MPTEST.PARTITION_AREA( 0 )'ADDRESS,
@@ -132,9 +133,9 @@
 
          TEXT_IO.PUT_LINE( "Sleeping for three seconds" );
-         RTEMS.TASK_WAKE_AFTER( 3 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+         RTEMS.TASKS.WAKE_AFTER( 3 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
 
          TEXT_IO.PUT_LINE( "Deleting Partition (Global)" );
-         RTEMS.PARTITION_DELETE( MPTEST.PARTITION_ID( 1 ), STATUS );
+         RTEMS.PARTITION.DELETE( MPTEST.PARTITION_ID( 1 ), STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_DELETE" );
 
Index: c/src/ada-tests/mptests/mp12/mptest.ads
===================================================================
--- c/src/ada-tests/mptests/mp12/mptest.ads	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp12/mptest.ads	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 
 package MPTEST is
@@ -64,5 +65,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, INIT);
Index: c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb
===================================================================
--- c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp12/node1/mp12_node1.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb
===================================================================
--- c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp12/node2/mp12_node2.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp13/mptest.adb
===================================================================
--- c/src/ada-tests/mptests/mp13/mptest.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp13/mptest.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -23,4 +23,7 @@
 with INTERFACES; use INTERFACES;
 with RTEMS;
+with RTEMS.MESSAGE_QUEUE;
+with RTEMS.SEMAPHORE;
+with RTEMS.TASKS;
 with TEST_SUPPORT;
 with TEXT_IO;
@@ -29,5 +32,4 @@
 package body MPTEST is
 
---PAGE
 --
 --  INIT
@@ -35,5 +37,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS : RTEMS.STATUS_CODES;
@@ -58,5 +60,5 @@
 
          TEXT_IO.PUT_LINE( "Creating Message Queue (Global)" );
-         RTEMS.MESSAGE_QUEUE_CREATE(
+         RTEMS.MESSAGE_QUEUE.CREATE(
             MPTEST.QUEUE_NAME( 1 ),
             3,
@@ -68,5 +70,5 @@
 
          TEXT_IO.PUT_LINE( "Creating Semaphore (Global)" );
-         RTEMS.SEMAPHORE_CREATE(
+         RTEMS.SEMAPHORE.CREATE(
             MPTEST.SEMAPHORE_NAME( 1 ),
             1,
@@ -77,5 +79,5 @@
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_CREATE" );
 
-         RTEMS.SEMAPHORE_OBTAIN(
+         RTEMS.SEMAPHORE.OBTAIN(
             MPTEST.SEMAPHORE_ID( 1 ),
             RTEMS.DEFAULT_OPTIONS,
@@ -88,5 +90,5 @@
 
       TEXT_IO.PUT_LINE( "Creating Test_task 1 (local)" );
-         RTEMS.TASK_CREATE(
+         RTEMS.TASKS.CREATE(
          MPTEST.TASK_NAME( 1 ),
          1,
@@ -100,5 +102,5 @@
 
       TEXT_IO.PUT_LINE( "Starting Test_task 1 (local)" );
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.TASK_ID( 1 ),
          MPTEST.TEST_TASK_1'ACCESS,
@@ -109,5 +111,5 @@
 
       TEXT_IO.PUT_LINE( "Creating Test_task 2 (local)" );
-      RTEMS.TASK_CREATE(
+      RTEMS.TASKS.CREATE(
          MPTEST.TASK_NAME( 2 ),
          1,
@@ -121,5 +123,5 @@
 
       TEXT_IO.PUT_LINE( "Starting Test_task 2 (local)" );
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.TASK_ID( 2 ),
          MPTEST.TEST_TASK_2'ACCESS,
@@ -131,5 +133,5 @@
       if TEST_SUPPORT.NODE = 1 then
 
-         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" );
 
@@ -141,10 +143,9 @@
 
       TEXT_IO.PUT_LINE( "Deleting initialization task" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end INIT;
 
---PAGE
 --
 --  TEST_TASK_1
@@ -152,5 +153,5 @@
 
    procedure TEST_TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       COUNT               : RTEMS.UNSIGNED32;
@@ -167,5 +168,5 @@
       loop
 
-         RTEMS.MESSAGE_QUEUE_IDENT(
+         RTEMS.MESSAGE_QUEUE.IDENT(
             MPTEST.QUEUE_NAME( 1 ),
             RTEMS.SEARCH_ALL_NODES,
@@ -181,5 +182,5 @@
 
          TEXT_IO.PUT_LINE( "Receiving message ..." );
-         RTEMS.MESSAGE_QUEUE_RECEIVE(
+         RTEMS.MESSAGE_QUEUE.RECEIVE(
             MPTEST.QUEUE_ID( 1 ),
             RECEIVE_BUFFER,
@@ -193,9 +194,9 @@
       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" );
 
       TEXT_IO.PUT_LINE( "Receiving message ..." );
-      RTEMS.MESSAGE_QUEUE_RECEIVE(
+      RTEMS.MESSAGE_QUEUE.RECEIVE(
          MPTEST.QUEUE_ID( 1 ),
          RECEIVE_BUFFER,
@@ -220,10 +221,9 @@
 
       TEXT_IO.PUT_LINE( "Deleting self" );
-      RTEMS.TASK_DELETE( RTEMS.SELF, STATUS );
+      RTEMS.TASKS.DELETE( RTEMS.SELF, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_DELETE OF SELF" );
 
    end TEST_TASK_1;
 
---PAGE
 --
 --  TEST_TASK_2
@@ -231,5 +231,5 @@
 
    procedure TEST_TASK_2 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       STATUS : RTEMS.STATUS_CODES;
@@ -240,5 +240,5 @@
       loop
 
-         RTEMS.SEMAPHORE_IDENT(
+         RTEMS.SEMAPHORE.IDENT(
             MPTEST.SEMAPHORE_NAME( 1 ),
             RTEMS.SEARCH_ALL_NODES,
@@ -253,16 +253,16 @@
       if TEST_SUPPORT.NODE = 1 then
 
-         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" );
 
          TEXT_IO.PUT_LINE( "Releasing semaphore ..." );
-         RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
+         RTEMS.SEMAPHORE.RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" );
 
-         RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS );
+         RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS );
          TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
 
          TEXT_IO.PUT_LINE( "Getting semaphore ..." );
-         RTEMS.SEMAPHORE_OBTAIN(
+         RTEMS.SEMAPHORE.OBTAIN(
             MPTEST.SEMAPHORE_ID( 1 ),
             RTEMS.DEFAULT_OPTIONS,
@@ -273,5 +273,5 @@
 
          TEXT_IO.PUT_LINE( "Getting semaphore ..." );
-         RTEMS.SEMAPHORE_OBTAIN(
+         RTEMS.SEMAPHORE.OBTAIN(
             MPTEST.SEMAPHORE_ID( 1 ),
             RTEMS.DEFAULT_OPTIONS,
@@ -284,9 +284,9 @@
       end if;
 
-      RTEMS.TASK_WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS );
+      RTEMS.TASKS.WAKE_AFTER( TEST_SUPPORT.TICKS_PER_SECOND / 2, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
 
       TEXT_IO.PUT_LINE( "Getting semaphore ..." );
-      RTEMS.SEMAPHORE_OBTAIN(
+      RTEMS.SEMAPHORE.OBTAIN(
          MPTEST.SEMAPHORE_ID( 1 ),
          RTEMS.DEFAULT_OPTIONS,
@@ -297,12 +297,12 @@
 
       TEXT_IO.PUT_LINE( "Releasing semaphore ..." );
-      RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
+      RTEMS.SEMAPHORE.RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" );
 
-      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" );
 
       TEXT_IO.PUT_LINE( "Getting semaphore ..." );
-      RTEMS.SEMAPHORE_OBTAIN(
+      RTEMS.SEMAPHORE.OBTAIN(
          MPTEST.SEMAPHORE_ID( 1 ),
          RTEMS.DEFAULT_OPTIONS,
Index: c/src/ada-tests/mptests/mp13/mptest.ads
===================================================================
--- c/src/ada-tests/mptests/mp13/mptest.ads	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp13/mptest.ads	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 
 package MPTEST is
@@ -72,5 +73,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, INIT);
@@ -85,5 +86,5 @@
 
    procedure TEST_TASK_1 (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK_1);
@@ -98,5 +99,5 @@
  
    procedure TEST_TASK_2 ( 
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK_2);
Index: c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb
===================================================================
--- c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp13/node1/mp13_node1.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb
===================================================================
--- c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp13/node2/mp13_node2.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp14/mptest.adb
===================================================================
--- c/src/ada-tests/mptests/mp14/mptest.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp14/mptest.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -24,4 +24,10 @@
 with INTERFACES.C;
 with RTEMS;
+with RTEMS.EVENT;
+with RTEMS.MESSAGE_QUEUE;
+with RTEMS.PARTITION;
+with RTEMS.SEMAPHORE;
+with RTEMS.TASKS;
+with RTEMS.TIMER;
 with TEST_SUPPORT;
 with TEXT_IO;
@@ -32,5 +38,4 @@
 package body MPTEST is
 
---PAGE
 --
 --  STOP_TEST_TSR
@@ -47,5 +52,4 @@
    end STOP_TEST_TSR;
  
---PAGE
 --
 --  EXIT_TEST
@@ -59,5 +63,5 @@
    begin
  
-      RTEMS.TASK_MODE(RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, OLD_MODE, STATUS);
+      RTEMS.TASKS.MODE(RTEMS.NO_PREEMPT, RTEMS.PREEMPT_MASK, OLD_MODE, STATUS);
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
 
@@ -68,5 +72,4 @@
    end EXIT_TEST;
  
---PAGE
 --
 --  INIT
@@ -74,9 +77,9 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       INDEX             : RTEMS.UNSIGNED32;
       STATUS            : RTEMS.STATUS_CODES;
-      PREVIOUS_PRIORITY : RTEMS.TASK_PRIORITY;
+      PREVIOUS_PRIORITY : RTEMS.TASKS.PRIORITY;
    begin
 
@@ -93,5 +96,5 @@
       MPTEST.STOP_TEST := FALSE;
 
-      RTEMS.TIMER_CREATE(
+      RTEMS.TIMER.CREATE(
          MPTEST.STOP_TIMER_NAME,
          MPTEST.STOP_TIMER_ID,
@@ -100,5 +103,5 @@
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" );
 
-      RTEMS.TIMER_FIRE_AFTER(
+      RTEMS.TIMER.FIRE_AFTER(
          MPTEST.STOP_TIMER_ID,
          TEST_SUPPORT.MAXIMUM_LONG_TEST_DURATION *
@@ -145,5 +148,5 @@
 
          TEXT_IO.PUT_LINE( "Creating Semaphore (Global)" );
-         RTEMS.SEMAPHORE_CREATE(
+         RTEMS.SEMAPHORE.CREATE(
             MPTEST.SEMAPHORE_NAME( 1 ),
             1,
@@ -155,5 +158,5 @@
 
          TEXT_IO.PUT_LINE( "Creating Message Queue (Global)" );
-         RTEMS.MESSAGE_QUEUE_CREATE(
+         RTEMS.MESSAGE_QUEUE.CREATE(
             MPTEST.QUEUE_NAME( 1 ),
             1,
@@ -165,5 +168,5 @@
 
          TEXT_IO.PUT_LINE( "Creating Partition (Global)" );
-         RTEMS.PARTITION_CREATE(
+         RTEMS.PARTITION.CREATE(
             MPTEST.PARTITION_NAME( 1 ),
             MPTEST.PARTITION_AREA( 0 )'ADDRESS,
@@ -179,5 +182,5 @@
 
       TEXT_IO.PUT_LINE( "Creating Event task (Global)" );
-      RTEMS.TASK_CREATE(
+      RTEMS.TASKS.CREATE(
          MPTEST.EVENT_TASK_NAME(
             TEST_SUPPORT.NODE
@@ -193,5 +196,5 @@
 
       TEXT_IO.PUT_LINE( "Starting Event task (Global)" );
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.EVENT_TASK_ID( 1 ),
          MPTEST.TEST_TASK'ACCESS,
@@ -202,5 +205,5 @@
 
       TEXT_IO.PUT_LINE( "Creating Semaphore task (Global)" );
-      RTEMS.TASK_CREATE(
+      RTEMS.TASKS.CREATE(
          MPTEST.SEMAPHORE_TASK_NAME(
             TEST_SUPPORT.NODE
@@ -216,5 +219,5 @@
 
       TEXT_IO.PUT_LINE( "Starting Semaphore task (Global)" );
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.SEMAPHORE_TASK_ID( 1 ),
          MPTEST.SEMAPHORE_TASK'ACCESS,
@@ -225,5 +228,5 @@
 
       TEXT_IO.PUT_LINE( "Creating Message Queue task (Global)" );
-      RTEMS.TASK_CREATE(
+      RTEMS.TASKS.CREATE(
          MPTEST.QUEUE_TASK_NAME(
             TEST_SUPPORT.NODE
@@ -239,5 +242,5 @@
 
       TEXT_IO.PUT_LINE( "Starting Message Queue task (Global)" );
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.QUEUE_TASK_ID( 1 ),
          MPTEST.MESSAGE_QUEUE_TASK'ACCESS,
@@ -248,5 +251,5 @@
 
       TEXT_IO.PUT_LINE( "Creating Partition task (Global)" );
-      RTEMS.TASK_CREATE(
+      RTEMS.TASKS.CREATE(
          MPTEST.PARTITION_TASK_NAME(
             TEST_SUPPORT.NODE 
@@ -262,5 +265,5 @@
 
       TEXT_IO.PUT_LINE( "Starting Partition task (Global)" );
-      RTEMS.TASK_START(
+      RTEMS.TASKS.START(
          MPTEST.PARTITION_TASK_ID( 1 ),
          MPTEST.PARTITION_TASK'ACCESS,
@@ -270,5 +273,5 @@
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_START" );
     
-      RTEMS.TASK_SET_PRIORITY( RTEMS.SELF, 2, PREVIOUS_PRIORITY, STATUS );
+      RTEMS.TASKS.SET_PRIORITY( RTEMS.SELF, 2, PREVIOUS_PRIORITY, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_SET_PRIORITY" );
 
@@ -293,5 +296,5 @@
    begin
 
-      RTEMS.EVENT_SEND(
+      RTEMS.EVENT.SEND(
          MPTEST.TASK_ID( RTEMS.GET_INDEX( TIMER_ID ) ),
          RTEMS.EVENT_16,
@@ -311,5 +314,5 @@
  
    procedure TEST_TASK ( 
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    ) is
       REMOTE_NODE : RTEMS.UNSIGNED32;
@@ -327,5 +330,5 @@
 
       TEXT_IO.PUT_LINE( "About to go to sleep!" );
-      RTEMS.TASK_WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
+      RTEMS.TASKS.WAKE_AFTER( 1 * TEST_SUPPORT.TICKS_PER_SECOND, STATUS );
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_WAKE_AFTER" );
       TEXT_IO.PUT_LINE( "Waking up!" );
@@ -338,5 +341,5 @@
       loop
 
-         RTEMS.TASK_IDENT(
+         RTEMS.TASKS.IDENT(
             MPTEST.EVENT_TASK_NAME( REMOTE_NODE ),
             RTEMS.SEARCH_ALL_NODES,
@@ -359,5 +362,5 @@
             for COUNT in 1 .. MPTEST.EVENT_TASK_DOT_COUNT
             loop
-               RTEMS.EVENT_SEND(
+               RTEMS.EVENT.SEND(
                   REMOTE_TID,
                   RTEMS.EVENT_16,
@@ -385,5 +388,5 @@
             exit when MPTEST.STOP_TEST = TRUE;
 
-            RTEMS.EVENT_RECEIVE(
+            RTEMS.EVENT.RECEIVE(
                RTEMS.EVENT_16,
                RTEMS.DEFAULT_OPTIONS,
@@ -413,5 +416,5 @@
   
    procedure DELAYED_EVENTS_TASK (  
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT 
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT 
    ) is
       COUNT         : RTEMS.UNSIGNED32;
@@ -421,5 +424,5 @@
    begin
 
-      RTEMS.TASK_MODE(
+      RTEMS.TASKS.MODE(
          RTEMS.PREEMPT + RTEMS.TIMESLICE,
          RTEMS.PREEMPT_MASK + RTEMS.TIMESLICE_MASK,
@@ -429,5 +432,5 @@
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TASK_MODE" );
  
-      RTEMS.TIMER_CREATE(
+      RTEMS.TIMER.CREATE(
          MPTEST.TIMER_NAME( 1 ),
          MPTEST.TIMER_ID( 1 ),
@@ -436,5 +439,5 @@
       TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_CREATE" );
 
-      RTEMS.TASK_IDENT(
+      RTEMS.TASKS.IDENT(
          RTEMS.SELF,
          RTEMS.SEARCH_ALL_NODES,
@@ -448,5 +451,5 @@
          for COUNT in 1 .. MPTEST.DELAYED_EVENT_DOT_COUNT 
          loop 
-            RTEMS.TIMER_FIRE_AFTER(
+            RTEMS.TIMER.FIRE_AFTER(
                MPTEST.TIMER_ID( 1 ),
                1,
@@ -457,5 +460,5 @@
             TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "TIMER_FIRE_AFTER" );
 
-            RTEMS.EVENT_RECEIVE(
+            RTEMS.EVENT.RECEIVE(
                RTEMS.EVENT_16,
                RTEMS.DEFAULT_OPTIONS,
@@ -485,5 +488,5 @@
   
    procedure MESSAGE_QUEUE_TASK (  
-      INDEX : in     RTEMS.TASK_ARGUMENT 
+      INDEX : in     RTEMS.TASKS.ARGUMENT 
    ) is
       COUNT          : RTEMS.UNSIGNED32;
@@ -503,5 +506,5 @@
       loop
 
-         RTEMS.MESSAGE_QUEUE_IDENT(
+         RTEMS.MESSAGE_QUEUE.IDENT(
             MPTEST.QUEUE_NAME( 1 ),
             RTEMS.SEARCH_ALL_NODES,
@@ -517,5 +520,5 @@
       if TEST_SUPPORT.NODE = 1 then
 
-         RTEMS.MESSAGE_QUEUE_SEND(
+         RTEMS.MESSAGE_QUEUE.SEND(
             MPTEST.QUEUE_ID( 1 ),
             MPTEST.BUFFERS( INDEX ),
@@ -555,5 +558,5 @@
            exit when MPTEST.STOP_TEST = TRUE;
 
-            RTEMS.MESSAGE_QUEUE_RECEIVE(
+            RTEMS.MESSAGE_QUEUE.RECEIVE(
                MPTEST.QUEUE_ID( 1 ),
                MPTEST.BUFFERS( INDEX ),
@@ -574,5 +577,5 @@
             end if;
 
-            RTEMS.MESSAGE_QUEUE_SEND(
+            RTEMS.MESSAGE_QUEUE.SEND(
                MPTEST.QUEUE_ID( 1 ),
                MPTEST.BUFFERS( INDEX ),
@@ -588,5 +591,5 @@
                   if YIELD_COUNT = 0 then
 
-                     RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
+                     RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
                      TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "YIELD" );
 
@@ -618,5 +621,5 @@
   
    procedure PARTITION_TASK (  
-      IGNORED : in     RTEMS.TASK_ARGUMENT 
+      IGNORED : in     RTEMS.TASKS.ARGUMENT 
    ) is
       COUNT  : RTEMS.UNSIGNED32;
@@ -629,5 +632,5 @@
       loop
 
-         RTEMS.PARTITION_IDENT(
+         RTEMS.PARTITION.IDENT(
             MPTEST.PARTITION_NAME( 1 ),
             RTEMS.SEARCH_ALL_NODES,
@@ -650,5 +653,5 @@
             exit when MPTEST.STOP_TEST = TRUE;
 
-            RTEMS.PARTITION_GET_BUFFER(
+            RTEMS.PARTITION.GET_BUFFER(
                MPTEST.PARTITION_ID( 1 ),
                BUFFER,
@@ -657,5 +660,5 @@
             TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "PARTITION_GET_BUFFER" );
 
-            RTEMS.PARTITION_RETURN_BUFFER(
+            RTEMS.PARTITION.RETURN_BUFFER(
                MPTEST.PARTITION_ID( 1 ),
                BUFFER,
@@ -669,5 +672,5 @@
             if TEST_SUPPORT.NODE = 1 then
 
-               RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
+               RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
                TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "YIELD" );
 
@@ -693,5 +696,5 @@
   
    procedure SEMAPHORE_TASK (  
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT 
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT 
    ) is
       COUNT          : RTEMS.UNSIGNED32;
@@ -704,5 +707,5 @@
       loop
 
-         RTEMS.SEMAPHORE_IDENT(
+         RTEMS.SEMAPHORE.IDENT(
             MPTEST.SEMAPHORE_NAME( 1 ),
             RTEMS.SEARCH_ALL_NODES,
@@ -727,5 +730,5 @@
             exit when MPTEST.STOP_TEST = TRUE;
 
-            RTEMS.SEMAPHORE_OBTAIN(
+            RTEMS.SEMAPHORE.OBTAIN(
                MPTEST.SEMAPHORE_ID( 1 ),
                RTEMS.DEFAULT_OPTIONS,
@@ -735,5 +738,5 @@
             TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_OBTAIN" );
 
-            RTEMS.SEMAPHORE_RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
+            RTEMS.SEMAPHORE.RELEASE( MPTEST.SEMAPHORE_ID( 1 ), STATUS );
             TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "SEMAPHORE_RELEASE" );
 
@@ -744,5 +747,5 @@
                if YIELD_COUNT = 0 then
 
-                  RTEMS.TASK_WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
+                  RTEMS.TASKS.WAKE_AFTER( RTEMS.YIELD_PROCESSOR, STATUS );
                   TEST_SUPPORT.DIRECTIVE_FAILED( STATUS, "YIELD" );
 
Index: c/src/ada-tests/mptests/mp14/mptest.ads
===================================================================
--- c/src/ada-tests/mptests/mp14/mptest.ads	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp14/mptest.ads	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-1997.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 
 package MPTEST is
@@ -176,5 +177,5 @@
 
    procedure INIT (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, INIT);
@@ -189,5 +190,5 @@
 
    procedure TEST_TASK (
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, TEST_TASK);
@@ -202,5 +203,5 @@
  
    procedure DELAYED_EVENTS_TASK ( 
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, DELAYED_EVENTS_TASK);
@@ -215,5 +216,5 @@
  
    procedure MESSAGE_QUEUE_TASK ( 
-      INDEX : in     RTEMS.TASK_ARGUMENT
+      INDEX : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, MESSAGE_QUEUE_TASK);
@@ -228,5 +229,5 @@
  
    procedure PARTITION_TASK ( 
-      IGNORED : in     RTEMS.TASK_ARGUMENT
+      IGNORED : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, PARTITION_TASK);
@@ -241,5 +242,5 @@
  
    procedure SEMAPHORE_TASK ( 
-      ARGUMENT : in     RTEMS.TASK_ARGUMENT
+      ARGUMENT : in     RTEMS.TASKS.ARGUMENT
    );
    pragma Convention (C, SEMAPHORE_TASK);
Index: c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb
===================================================================
--- c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp14/node1/mp14_node1.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
Index: c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb
===================================================================
--- c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb	(revision 3a23218a74723a77a5438c6960879e4ab4e1d2be)
+++ c/src/ada-tests/mptests/mp14/node2/mp14_node2.adb	(revision 3c4d8cd15e9a3ffd24f2c5b4643d208d71a08dfb)
@@ -11,5 +11,5 @@
 --  
 --
---  COPYRIGHT (c) 1989-2007.
+--  COPYRIGHT (c) 1989-2011.
 --  On-Line Applications Research Corporation (OAR).
 --
@@ -22,4 +22,5 @@
 
 with RTEMS;
+with RTEMS.TASKS;
 with MPTEST;
 with TEST_SUPPORT;
@@ -30,5 +31,5 @@
 begin
 
-   RTEMS.TASK_CREATE(
+   RTEMS.TASKS.CREATE(
       RTEMS.BUILD_NAME(  'I', 'N', 'I', 'T' ),
       1,
@@ -42,5 +43,5 @@
 
 
-   RTEMS.TASK_START(
+   RTEMS.TASKS.START(
       INIT_ID,
       MPTEST.INIT'ACCESS,
