3 files changed, 15 insertions, 16 deletions
diff --git a/spec/req/rtems/event/send-receive.yml b/spec/req/rtems/event/send-receive.yml
index 9465a7aa..5723e57e 100644
--- a/spec/req/rtems/event/send-receive.yml
+++ b/spec/req/rtems/event/send-receive.yml
@@ -461,14 +461,14 @@ test-prepare: |
 test-setup:
   brief: null
   code: |
-    static char  task_stack[ RTEMS_MINIMUM_STACK_SIZE ];
+    static char  task_storage[ RTEMS_MINIMUM_STACK_SIZE ];
     static const rtems_task_config task_config = {
       .name = rtems_build_name( 'W', 'O', 'R', 'K' ),
       .initial_priority = PRIO_LOW,
-      .stack_area = task_stack,
-      .stack_size = sizeof( task_stack ),
+      .storage_area = task_storage,
+      .storage_size = sizeof( task_storage ),
       .initial_modes = RTEMS_DEFAULT_MODES,
-      .attribute_set = RTEMS_DEFAULT_ATTRIBUTES
+      .attributes = RTEMS_DEFAULT_ATTRIBUTES
     };
 
     rtems_status_code   sc;
diff --git a/spec/req/rtems/tasks/create-from-config-errors.yml b/spec/req/rtems/tasks/construct-errors.yml
index 8802e422..2e24ac94 100644
--- a/spec/req/rtems/tasks/create-from-config-errors.yml
+++ b/spec/req/rtems/tasks/construct-errors.yml
@@ -5,7 +5,7 @@ enabled-by: true
 functional-type: action
 links:
 - role: interface-function
-  uid: /if/rtems/tasks/create-from-config
+  uid: /if/rtems/tasks/construct
 post-conditions:
 - name: Status
   states:
@@ -19,7 +19,7 @@ post-conditions:
       T_rsc_success( sc );
     text: |
       The status shall be RTEMS_SUCCESSFUL.  The value of the object identifier
-      referenced by the id parameter shall identify the created task.
+      referenced by the id parameter shall identify the constructed task.
   - name: InvAddress
     test-code: |
       T_rsc( ctx->status, RTEMS_INVALID_ADDRESS );
@@ -134,7 +134,7 @@ pre-conditions:
         rtems_status_code sc;
         rtems_id id;
 
-        sc = rtems_task_create_from_config( &valid_task_config, &id );
+        sc = rtems_task_construct( &valid_task_config, &id );
 
         if ( sc == RTEMS_SUCCESSFUL ) {
           Objects_Control           *obj;
@@ -230,7 +230,7 @@ test-action: |
     ctx->config.maximum_thread_local_storage_size + ctx->stack_size,
     ctx->config.attributes
   );
-  ctx->status = rtems_task_create_from_config( &ctx->config, ctx->id );
+  ctx->status = rtems_task_construct( &ctx->config, ctx->id );
 test-brief: null
 test-cleanup: |
   Chain_Node *node;
@@ -303,9 +303,9 @@ test-stop: null
 test-support: |
   static _Thread_local int tls_variable;
 
-  #define MAX_TLS_SIZE 128
+  #define MAX_TLS_SIZE RTEMS_ALIGN_UP( 128, RTEMS_TASK_STORAGE_ALIGNMENT )
 
-  RTEMS_TASK_STORAGE_ALIGNMENT static char task_storage[
+  RTEMS_ALIGNED( RTEMS_TASK_STORAGE_ALIGNMENT ) static char task_storage[
     RTEMS_TASK_STORAGE_SIZE(
       MAX_TLS_SIZE + RTEMS_MINIMUM_STACK_SIZE,
       RTEMS_FLOATING_POINT
@@ -327,14 +327,13 @@ test-support: |
     (void) executing;
     (void) created;
 
-    return
-      ReqRtemsTasksCreateFromConfigErrors_Instance.create_extension_status;
+    return ReqRtemsTasksConstructErrors_Instance.create_extension_status;
   }
 
   static const rtems_extensions_table extensions = {
     .thread_create = ThreadCreate
   };
-test-target: testsuites/validation/tc-tasks-create-from-config-errors.c
+test-target: testsuites/validation/tc-task-construct-errors.c
 test-teardown:
   brief: null
   code: |
diff --git a/spec/req/rtems/tasks/ident.yml b/spec/req/rtems/tasks/ident.yml
index 43e0d23e..9b4df1d4 100644
--- a/spec/req/rtems/tasks/ident.yml
+++ b/spec/req/rtems/tasks/ident.yml
@@ -84,10 +84,10 @@ test-setup:
     static const rtems_task_config task_config = {
       .name = ClassicObjectIdentName,
       .initial_priority = 1,
-      .stack_area = task_storage,
-      .stack_size = sizeof( task_storage ),
+      .storage_area = task_storage,
+      .storage_size = sizeof( task_storage ),
       .initial_modes = RTEMS_DEFAULT_MODES,
-      .attribute_set = RTEMS_DEFAULT_ATTRIBUTES
+      .attributes = RTEMS_DEFAULT_ATTRIBUTES
     };
     rtems_status_code sc;