diff --git a/arch/8051/src/up_exit.c b/arch/8051/src/up_exit.c
index c96467bf9d1..31d8c99ab74 100644
--- a/arch/8051/src/up_exit.c
+++ b/arch/8051/src/up_exit.c
@@ -89,7 +89,7 @@ void _exit(int status)
 
   /* Destroy the task at the head of the ready to run list. */
 
-  (void)task_deletecurrent();
+  (void)task_exit();
 
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
diff --git a/arch/arm/src/common/up_exit.c b/arch/arm/src/common/up_exit.c
index 76bf4e0dd38..95a71f832ac 100644
--- a/arch/arm/src/common/up_exit.c
+++ b/arch/arm/src/common/up_exit.c
@@ -153,7 +153,7 @@ void _exit(int status)
 
   /* Destroy the task at the head of the ready to run list. */
 
-  (void)task_deletecurrent();
+  (void)task_exit();
 
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
diff --git a/arch/avr/src/common/up_exit.c b/arch/avr/src/common/up_exit.c
index 3b316123b17..93ec7c487b2 100644
--- a/arch/avr/src/common/up_exit.c
+++ b/arch/avr/src/common/up_exit.c
@@ -153,7 +153,7 @@ void _exit(int status)
 
   /* Destroy the task at the head of the ready to run list. */
 
-  (void)task_deletecurrent();
+  (void)task_exit();
 
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
diff --git a/arch/hc/src/common/up_exit.c b/arch/hc/src/common/up_exit.c
index 9fad697f190..c71bbafd139 100644
--- a/arch/hc/src/common/up_exit.c
+++ b/arch/hc/src/common/up_exit.c
@@ -153,7 +153,7 @@ void _exit(int status)
 
   /* Destroy the task at the head of the ready to run list. */
 
-  (void)task_deletecurrent();
+  (void)task_exit();
 
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
diff --git a/arch/mips/src/common/up_exit.c b/arch/mips/src/common/up_exit.c
index a5746f8aa82..8791fa40bd5 100644
--- a/arch/mips/src/common/up_exit.c
+++ b/arch/mips/src/common/up_exit.c
@@ -155,7 +155,7 @@ void _exit(int status)
 
   /* Destroy the task at the head of the ready to run list. */
 
-  (void)task_deletecurrent();
+  (void)task_exit();
 
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
diff --git a/arch/rgmp/src/nuttx.c b/arch/rgmp/src/nuttx.c
index da67ac2148c..a4f713be6d9 100644
--- a/arch/rgmp/src/nuttx.c
+++ b/arch/rgmp/src/nuttx.c
@@ -422,7 +422,7 @@ void _exit(int status)
 
     /* Destroy the task at the head of the ready to run list. */
 
-    (void)task_deletecurrent();
+    (void)task_exit();
 
     /* Now, perform the context switch to the new ready-to-run task at the
      * head of the list.
diff --git a/arch/sh/src/common/up_exit.c b/arch/sh/src/common/up_exit.c
index 31c8e040493..e454d1b6432 100644
--- a/arch/sh/src/common/up_exit.c
+++ b/arch/sh/src/common/up_exit.c
@@ -154,7 +154,7 @@ void _exit(int status)
 
   /* Destroy the task at the head of the ready to run list. */
 
-  (void)task_deletecurrent();
+  (void)task_exit();
 
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
diff --git a/arch/sim/src/up_exit.c b/arch/sim/src/up_exit.c
index 348c4a9e656..7d7d4d04111 100644
--- a/arch/sim/src/up_exit.c
+++ b/arch/sim/src/up_exit.c
@@ -82,7 +82,7 @@ void _exit(int status)
 
   /* Destroy the task at the head of the ready to run list. */
 
-  (void)task_deletecurrent();
+  (void)task_exit();
 
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
diff --git a/arch/x86/src/common/up_exit.c b/arch/x86/src/common/up_exit.c
index 2aa21f35226..9b0c0cbe101 100644
--- a/arch/x86/src/common/up_exit.c
+++ b/arch/x86/src/common/up_exit.c
@@ -153,7 +153,7 @@ void _exit(int status)
 
   /* Destroy the task at the head of the ready to run list. */
 
-  (void)task_deletecurrent();
+  (void)task_exit();
 
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
diff --git a/arch/z16/src/common/up_exit.c b/arch/z16/src/common/up_exit.c
index 59764484fde..e4c6dcf9c8f 100644
--- a/arch/z16/src/common/up_exit.c
+++ b/arch/z16/src/common/up_exit.c
@@ -155,7 +155,7 @@ void _exit(int status)
 
   /* Destroy the task at the head of the ready to run list. */
 
-  (void)task_deletecurrent();
+  (void)task_exit();
 
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.
diff --git a/arch/z80/src/common/up_exit.c b/arch/z80/src/common/up_exit.c
index c738202a9f8..aa578f29e52 100644
--- a/arch/z80/src/common/up_exit.c
+++ b/arch/z80/src/common/up_exit.c
@@ -156,7 +156,7 @@ void _exit(int status)
 
   /* Destroy the task at the head of the ready to run list. */
 
-  (void)task_deletecurrent();
+  (void)task_exit();
 
   /* Now, perform the context switch to the new ready-to-run task at the
    * head of the list.