diff --git a/arch/arm/src/arm/up_assert.c b/arch/arm/src/arm/up_assert.c
index c9ed3cff3b0..28b7776f976 100644
--- a/arch/arm/src/arm/up_assert.c
+++ b/arch/arm/src/arm/up_assert.c
@@ -318,7 +318,7 @@ static void _up_assert(int errorcode)
 #ifdef CONFIG_ARCH_LEDS
           board_autoled_on(LED_PANIC);
           up_mdelay(250);
-          board_led_off(LED_PANIC);
+          board_autoled_off(LED_PANIC);
           up_mdelay(250);
 #endif
         }
diff --git a/arch/arm/src/arm/up_doirq.c b/arch/arm/src/arm/up_doirq.c
index 7df75a436d1..52603f435d5 100644
--- a/arch/arm/src/arm/up_doirq.c
+++ b/arch/arm/src/arm/up_doirq.c
@@ -130,5 +130,5 @@ void up_doirq(int irq, uint32_t *regs)
 
   current_regs = NULL;
 #endif
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
 }
diff --git a/arch/arm/src/arm/up_sigdeliver.c b/arch/arm/src/arm/up_sigdeliver.c
index 38127a706a2..eab3193bf00 100644
--- a/arch/arm/src/arm/up_sigdeliver.c
+++ b/arch/arm/src/arm/up_sigdeliver.c
@@ -132,7 +132,7 @@ void up_sigdeliver(void)
 
   /* Then restore the correct state for this thread of execution. */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   up_fullcontextrestore(regs);
 }
 
diff --git a/arch/arm/src/armv6-m/up_assert.c b/arch/arm/src/armv6-m/up_assert.c
index 9f196926a33..0e05acdd4a7 100644
--- a/arch/arm/src/armv6-m/up_assert.c
+++ b/arch/arm/src/armv6-m/up_assert.c
@@ -373,7 +373,7 @@ static void _up_assert(int errorcode)
 #ifdef CONFIG_ARCH_LEDS
           board_autoled_on(LED_PANIC);
           up_mdelay(250);
-          board_led_off(LED_PANIC);
+          board_autoled_off(LED_PANIC);
           up_mdelay(250);
 #endif
         }
diff --git a/arch/arm/src/armv6-m/up_doirq.c b/arch/arm/src/armv6-m/up_doirq.c
index 4be88b4c088..3edc9d3b82e 100644
--- a/arch/arm/src/armv6-m/up_doirq.c
+++ b/arch/arm/src/armv6-m/up_doirq.c
@@ -116,6 +116,6 @@ uint32_t *up_doirq(int irq, uint32_t *regs)
 
   current_regs = savestate;
 #endif
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
   return regs;
 }
diff --git a/arch/arm/src/armv6-m/up_sigdeliver.c b/arch/arm/src/armv6-m/up_sigdeliver.c
index 153c9bd4d05..b5630625025 100644
--- a/arch/arm/src/armv6-m/up_sigdeliver.c
+++ b/arch/arm/src/armv6-m/up_sigdeliver.c
@@ -143,7 +143,7 @@ void up_sigdeliver(void)
    * execution.
    */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   up_fullcontextrestore(regs);
 }
 
diff --git a/arch/arm/src/armv7-a/arm_assert.c b/arch/arm/src/armv7-a/arm_assert.c
index 166de067acc..a814a80bb02 100644
--- a/arch/arm/src/armv7-a/arm_assert.c
+++ b/arch/arm/src/armv7-a/arm_assert.c
@@ -373,7 +373,7 @@ static void _up_assert(int errorcode)
 #ifdef CONFIG_ARCH_LEDS
           board_autoled_on(LED_PANIC);
           up_mdelay(250);
-          board_led_off(LED_PANIC);
+          board_autoled_off(LED_PANIC);
           up_mdelay(250);
 #endif
         }
diff --git a/arch/arm/src/armv7-a/arm_doirq.c b/arch/arm/src/armv7-a/arm_doirq.c
index f62fc7f60c1..79a5ed5f557 100644
--- a/arch/arm/src/armv7-a/arm_doirq.c
+++ b/arch/arm/src/armv7-a/arm_doirq.c
@@ -128,6 +128,6 @@ uint32_t *arm_doirq(int irq, uint32_t *regs)
   current_regs = NULL;
 #endif
 
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
   return regs;
 }
diff --git a/arch/arm/src/armv7-a/arm_sigdeliver.c b/arch/arm/src/armv7-a/arm_sigdeliver.c
index 1cfa8884219..1f52b5ec913 100644
--- a/arch/arm/src/armv7-a/arm_sigdeliver.c
+++ b/arch/arm/src/armv7-a/arm_sigdeliver.c
@@ -132,7 +132,7 @@ void up_sigdeliver(void)
 
   /* Then restore the correct state for this thread of execution. */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   up_fullcontextrestore(regs);
 }
 
diff --git a/arch/arm/src/armv7-m/up_assert.c b/arch/arm/src/armv7-m/up_assert.c
index 74ac5e30e5e..b18bc1e265c 100644
--- a/arch/arm/src/armv7-m/up_assert.c
+++ b/arch/arm/src/armv7-m/up_assert.c
@@ -382,7 +382,7 @@ static void _up_assert(int errorcode)
 #ifdef CONFIG_ARCH_LEDS
           board_autoled_on(LED_PANIC);
           up_mdelay(250);
-          board_led_off(LED_PANIC);
+          board_autoled_off(LED_PANIC);
           up_mdelay(250);
 #endif
         }
diff --git a/arch/arm/src/armv7-m/up_doirq.c b/arch/arm/src/armv7-m/up_doirq.c
index 27740d2704f..71c1fc7d11e 100644
--- a/arch/arm/src/armv7-m/up_doirq.c
+++ b/arch/arm/src/armv7-m/up_doirq.c
@@ -116,6 +116,6 @@ uint32_t *up_doirq(int irq, uint32_t *regs)
 
   current_regs = savestate;
 #endif
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
   return regs;
 }
diff --git a/arch/arm/src/armv7-m/up_sigdeliver.c b/arch/arm/src/armv7-m/up_sigdeliver.c
index 085380fb5a9..8d24cf9e460 100644
--- a/arch/arm/src/armv7-m/up_sigdeliver.c
+++ b/arch/arm/src/armv7-m/up_sigdeliver.c
@@ -146,7 +146,7 @@ void up_sigdeliver(void)
    * execution.
    */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   up_fullcontextrestore(regs);
 }
 
diff --git a/arch/arm/src/efm32/efm32_idle.c b/arch/arm/src/efm32/efm32_idle.c
index 75c9905c1b9..9e0c218e0e9 100644
--- a/arch/arm/src/efm32/efm32_idle.c
+++ b/arch/arm/src/efm32/efm32_idle.c
@@ -62,7 +62,7 @@
 
 #if defined(CONFIG_ARCH_LEDS) && defined(LED_IDLE)
 #  define BEGIN_IDLE() board_autoled_on(LED_IDLE)
-#  define END_IDLE()   board_led_off(LED_IDLE)
+#  define END_IDLE()   board_autoled_off(LED_IDLE)
 #else
 #  define BEGIN_IDLE()
 #  define END_IDLE()
diff --git a/arch/arm/src/kinetis/kinetis_idle.c b/arch/arm/src/kinetis/kinetis_idle.c
index b47e56a668b..71ee037c14c 100644
--- a/arch/arm/src/kinetis/kinetis_idle.c
+++ b/arch/arm/src/kinetis/kinetis_idle.c
@@ -55,7 +55,7 @@
 
 #if defined(CONFIG_ARCH_LEDS) && defined(LED_IDLE)
 #  define BEGIN_IDLE() board_autoled_on(LED_IDLE)
-#  define END_IDLE()   board_led_off(LED_IDLE)
+#  define END_IDLE()   board_autoled_off(LED_IDLE)
 #else
 #  define BEGIN_IDLE()
 #  define END_IDLE()
diff --git a/arch/arm/src/kl/kl_idle.c b/arch/arm/src/kl/kl_idle.c
index 8e34a7a1a40..ce7ec7ff356 100644
--- a/arch/arm/src/kl/kl_idle.c
+++ b/arch/arm/src/kl/kl_idle.c
@@ -59,7 +59,7 @@
 
 #if defined(CONFIG_ARCH_LEDS) && defined(LED_IDLE)
 #  define BEGIN_IDLE() board_autoled_on(LED_IDLE)
-#  define END_IDLE()   board_led_off(LED_IDLE)
+#  define END_IDLE()   board_autoled_off(LED_IDLE)
 #else
 #  define BEGIN_IDLE()
 #  define END_IDLE()
diff --git a/arch/arm/src/lpc11xx/lpc11_idle.c b/arch/arm/src/lpc11xx/lpc11_idle.c
index e45cf3068b9..802105dbc19 100644
--- a/arch/arm/src/lpc11xx/lpc11_idle.c
+++ b/arch/arm/src/lpc11xx/lpc11_idle.c
@@ -54,7 +54,7 @@
 
 #if defined(CONFIG_ARCH_LEDS) && defined(LED_IDLE)
 #  define BEGIN_IDLE() board_autoled_on(LED_IDLE)
-#  define END_IDLE()   board_led_off(LED_IDLE)
+#  define END_IDLE()   board_autoled_off(LED_IDLE)
 #else
 #  define BEGIN_IDLE()
 #  define END_IDLE()
diff --git a/arch/arm/src/lpc17xx/lpc17_idle.c b/arch/arm/src/lpc17xx/lpc17_idle.c
index db90892e448..71d940a6ab5 100644
--- a/arch/arm/src/lpc17xx/lpc17_idle.c
+++ b/arch/arm/src/lpc17xx/lpc17_idle.c
@@ -56,7 +56,7 @@
 
 #if defined(CONFIG_ARCH_LEDS) && defined(LED_IDLE)
 #  define BEGIN_IDLE() board_autoled_on(LED_IDLE)
-#  define END_IDLE()   board_led_off(LED_IDLE)
+#  define END_IDLE()   board_autoled_off(LED_IDLE)
 #else
 #  define BEGIN_IDLE()
 #  define END_IDLE()
diff --git a/arch/arm/src/lpc43xx/lpc43_idle.c b/arch/arm/src/lpc43xx/lpc43_idle.c
index 476c36c91f4..8b15bb079a4 100644
--- a/arch/arm/src/lpc43xx/lpc43_idle.c
+++ b/arch/arm/src/lpc43xx/lpc43_idle.c
@@ -58,7 +58,7 @@
 
 #if defined(CONFIG_ARCH_LEDS) && defined(LED_IDLE)
 #  define BEGIN_IDLE() board_autoled_on(LED_IDLE)
-#  define END_IDLE()   board_led_off(LED_IDLE)
+#  define END_IDLE()   board_autoled_off(LED_IDLE)
 #else
 #  define BEGIN_IDLE()
 #  define END_IDLE()
diff --git a/arch/arm/src/nuc1xx/nuc_idle.c b/arch/arm/src/nuc1xx/nuc_idle.c
index d656767e7ed..5414c70e74a 100644
--- a/arch/arm/src/nuc1xx/nuc_idle.c
+++ b/arch/arm/src/nuc1xx/nuc_idle.c
@@ -59,7 +59,7 @@
 
 #if defined(CONFIG_ARCH_LEDS) && defined(LED_IDLE)
 #  define BEGIN_IDLE() board_autoled_on(LED_IDLE)
-#  define END_IDLE()   board_led_off(LED_IDLE)
+#  define END_IDLE()   board_autoled_off(LED_IDLE)
 #else
 #  define BEGIN_IDLE()
 #  define END_IDLE()
diff --git a/arch/arm/src/samdl/sam_idle.c b/arch/arm/src/samdl/sam_idle.c
index 743b26a4f78..b661733d745 100644
--- a/arch/arm/src/samdl/sam_idle.c
+++ b/arch/arm/src/samdl/sam_idle.c
@@ -59,7 +59,7 @@
 
 #if defined(CONFIG_ARCH_LEDS) && defined(LED_IDLE)
 #  define BEGIN_IDLE() board_autoled_on(LED_IDLE)
-#  define END_IDLE()   board_led_off(LED_IDLE)
+#  define END_IDLE()   board_autoled_off(LED_IDLE)
 #else
 #  define BEGIN_IDLE()
 #  define END_IDLE()
diff --git a/arch/arm/src/stm32/stm32_idle.c b/arch/arm/src/stm32/stm32_idle.c
index 2934cc3e4c3..ce95c861ee9 100644
--- a/arch/arm/src/stm32/stm32_idle.c
+++ b/arch/arm/src/stm32/stm32_idle.c
@@ -61,7 +61,7 @@
 
 #if defined(CONFIG_ARCH_LEDS) && defined(LED_IDLE)
 #  define BEGIN_IDLE() board_autoled_on(LED_IDLE)
-#  define END_IDLE()   board_led_off(LED_IDLE)
+#  define END_IDLE()   board_autoled_off(LED_IDLE)
 #else
 #  define BEGIN_IDLE()
 #  define END_IDLE()
diff --git a/arch/arm/src/str71x/str71x_decodeirq.c b/arch/arm/src/str71x/str71x_decodeirq.c
index 72e4da677cb..9e28a1b4aee 100644
--- a/arch/arm/src/str71x/str71x_decodeirq.c
+++ b/arch/arm/src/str71x/str71x_decodeirq.c
@@ -138,6 +138,6 @@ void up_decodeirq(uint32_t *regs)
       PANIC(); /* Normally never happens */
     }
 #endif
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
 #endif
 }
diff --git a/arch/avr/src/avr/up_doirq.c b/arch/avr/src/avr/up_doirq.c
index b692420a4d4..88cbcce8700 100644
--- a/arch/avr/src/avr/up_doirq.c
+++ b/arch/avr/src/avr/up_doirq.c
@@ -112,7 +112,7 @@ uint8_t *up_doirq(uint8_t irq, uint8_t *regs)
 
   current_regs = savestate;
 #endif
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
   return regs;
 }
 
diff --git a/arch/avr/src/avr/up_sigdeliver.c b/arch/avr/src/avr/up_sigdeliver.c
index 92604bcf14d..0db6a03344f 100644
--- a/arch/avr/src/avr/up_sigdeliver.c
+++ b/arch/avr/src/avr/up_sigdeliver.c
@@ -147,7 +147,7 @@ void up_sigdeliver(void)
    *      to the size of register save structure size will protect its contents.
    */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   up_fullcontextrestore(regs);
 }
 
diff --git a/arch/avr/src/avr32/up_doirq.c b/arch/avr/src/avr32/up_doirq.c
index 6acf3c9f099..14b4d6a7ae9 100644
--- a/arch/avr/src/avr32/up_doirq.c
+++ b/arch/avr/src/avr32/up_doirq.c
@@ -133,7 +133,7 @@ uint32_t *up_doirq(int irq, uint32_t *regs)
 
   current_regs = NULL;
 #endif
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
   return regs;
 }
 
diff --git a/arch/avr/src/avr32/up_sigdeliver.c b/arch/avr/src/avr32/up_sigdeliver.c
index e4be7e7d164..60387714857 100644
--- a/arch/avr/src/avr32/up_sigdeliver.c
+++ b/arch/avr/src/avr32/up_sigdeliver.c
@@ -150,7 +150,7 @@ void up_sigdeliver(void)
    *      to the size of register save structure size will protect its contents.
    */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   up_fullcontextrestore(regs);
 }
 
diff --git a/arch/avr/src/common/up_assert.c b/arch/avr/src/common/up_assert.c
index cddb4a7c861..04c2809052a 100644
--- a/arch/avr/src/common/up_assert.c
+++ b/arch/avr/src/common/up_assert.c
@@ -113,7 +113,7 @@ static void _up_assert(int errorcode)
 #ifdef CONFIG_ARCH_LEDS
           board_autoled_on(LED_PANIC);
           up_mdelay(250);
-          board_led_off(LED_PANIC);
+          board_autoled_off(LED_PANIC);
           up_mdelay(250);
 #endif
         }
diff --git a/arch/hc/src/common/up_doirq.c b/arch/hc/src/common/up_doirq.c
index a0cb7998aa2..99e7ba6a64c 100644
--- a/arch/hc/src/common/up_doirq.c
+++ b/arch/hc/src/common/up_doirq.c
@@ -133,6 +133,6 @@ uint8_t *up_doirq(int irq, uint8_t *regs)
 
   current_regs = NULL;
 #endif
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
   return regs;
 }
diff --git a/arch/hc/src/m9s12/m9s12_assert.c b/arch/hc/src/m9s12/m9s12_assert.c
index a99da66185d..7f48615c9a0 100644
--- a/arch/hc/src/m9s12/m9s12_assert.c
+++ b/arch/hc/src/m9s12/m9s12_assert.c
@@ -301,7 +301,7 @@ static void _up_assert(int errorcode)
 #ifdef CONFIG_ARCH_LEDS
             board_autoled_on(LED_PANIC);
             up_mdelay(250);
-            board_led_off(LED_PANIC);
+            board_autoled_off(LED_PANIC);
             up_mdelay(250);
 #endif
           }
diff --git a/arch/mips/src/mips32/up_assert.c b/arch/mips/src/mips32/up_assert.c
index a02750874e3..c392bf5386c 100644
--- a/arch/mips/src/mips32/up_assert.c
+++ b/arch/mips/src/mips32/up_assert.c
@@ -113,7 +113,7 @@ static void _up_assert(int errorcode)
 #ifdef CONFIG_ARCH_LEDS
             board_autoled_on(LED_PANIC);
             up_mdelay(250);
-            board_led_off(LED_PANIC);
+            board_autoled_off(LED_PANIC);
             up_mdelay(250);
 #endif
           }
diff --git a/arch/mips/src/mips32/up_doirq.c b/arch/mips/src/mips32/up_doirq.c
index debc56b6421..5cb7fbdbb31 100644
--- a/arch/mips/src/mips32/up_doirq.c
+++ b/arch/mips/src/mips32/up_doirq.c
@@ -143,6 +143,6 @@ uint32_t *up_doirq(int irq, uint32_t *regs)
 
   up_enable_irq(irq);
 #endif
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
   return regs;
 }
diff --git a/arch/mips/src/mips32/up_sigdeliver.c b/arch/mips/src/mips32/up_sigdeliver.c
index d255b2b820f..060298010c9 100644
--- a/arch/mips/src/mips32/up_sigdeliver.c
+++ b/arch/mips/src/mips32/up_sigdeliver.c
@@ -136,7 +136,7 @@ void up_sigdeliver(void)
    * execution.
    */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   up_fullcontextrestore(regs);
 
   /* up_fullcontextrestore() should not return but could if the software
diff --git a/arch/mips/src/pic32mx/pic32mx-decodeirq.c b/arch/mips/src/pic32mx/pic32mx-decodeirq.c
index 24b13217651..13144eb67e6 100644
--- a/arch/mips/src/pic32mx/pic32mx-decodeirq.c
+++ b/arch/mips/src/pic32mx/pic32mx-decodeirq.c
@@ -189,11 +189,11 @@ uint32_t *pic32mx_decodeirq(uint32_t *regs)
   current_regs = savestate;
   if (current_regs == NULL)
     {
-      board_led_off(LED_INIRQ);
+      board_autoled_off(LED_INIRQ);
     }
 #else
   current_regs = NULL;
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
 #endif
 
   return regs;
diff --git a/arch/mips/src/pic32mz/pic32mz-decodeirq.c b/arch/mips/src/pic32mz/pic32mz-decodeirq.c
index bcf35488f86..632af96b462 100644
--- a/arch/mips/src/pic32mz/pic32mz-decodeirq.c
+++ b/arch/mips/src/pic32mz/pic32mz-decodeirq.c
@@ -189,11 +189,11 @@ uint32_t *pic32mz_decodeirq(uint32_t *regs)
   current_regs = savestate;
   if (current_regs == NULL)
     {
-      board_led_off(LED_INIRQ);
+      board_autoled_off(LED_INIRQ);
     }
 #else
   current_regs = NULL;
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
 #endif
 
   return regs;
diff --git a/arch/sh/src/common/up_assert.c b/arch/sh/src/common/up_assert.c
index 2a3b89eaeb9..3499e9404dc 100644
--- a/arch/sh/src/common/up_assert.c
+++ b/arch/sh/src/common/up_assert.c
@@ -101,7 +101,7 @@ static void _up_assert(int errorcode)
 #ifdef CONFIG_ARCH_LEDS
             board_autoled_on(LED_PANIC);
             up_mdelay(250);
-            board_led_off(LED_PANIC);
+            board_autoled_off(LED_PANIC);
             up_mdelay(250);
 #endif
           }
diff --git a/arch/sh/src/common/up_doirq.c b/arch/sh/src/common/up_doirq.c
index 530a6e41af2..dd0edc42db6 100644
--- a/arch/sh/src/common/up_doirq.c
+++ b/arch/sh/src/common/up_doirq.c
@@ -133,7 +133,7 @@ uint32_t *up_doirq(int irq, uint32_t* regs)
       current_regs = NULL;
     }
 
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
 #endif
   return regs;
 }
diff --git a/arch/sh/src/m16c/m16c_sigdeliver.c b/arch/sh/src/m16c/m16c_sigdeliver.c
index e27ef794522..220e8e2c280 100644
--- a/arch/sh/src/m16c/m16c_sigdeliver.c
+++ b/arch/sh/src/m16c/m16c_sigdeliver.c
@@ -136,7 +136,7 @@ void up_sigdeliver(void)
    * execution.
    */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   up_fullcontextrestore(regs);
 #endif
 }
diff --git a/arch/sh/src/sh1/sh1_sigdeliver.c b/arch/sh/src/sh1/sh1_sigdeliver.c
index 7d53f29c654..69f5446df56 100644
--- a/arch/sh/src/sh1/sh1_sigdeliver.c
+++ b/arch/sh/src/sh1/sh1_sigdeliver.c
@@ -133,7 +133,7 @@ void up_sigdeliver(void)
 
   /* Then restore the correct state for this thread of execution. */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   up_fullcontextrestore(regs);
 #endif
 }
diff --git a/arch/x86/src/common/up_assert.c b/arch/x86/src/common/up_assert.c
index 025f121f125..0e4761c2bc2 100644
--- a/arch/x86/src/common/up_assert.c
+++ b/arch/x86/src/common/up_assert.c
@@ -263,7 +263,7 @@ static void _up_assert(int errorcode)
 #ifdef CONFIG_ARCH_LEDS
             board_autoled_on(LED_PANIC);
             up_mdelay(250);
-            board_led_off(LED_PANIC);
+            board_autoled_off(LED_PANIC);
             up_mdelay(250);
 #endif
           }
diff --git a/arch/x86/src/i486/up_sigdeliver.c b/arch/x86/src/i486/up_sigdeliver.c
index 4824bbb4737..ddc87e08d85 100644
--- a/arch/x86/src/i486/up_sigdeliver.c
+++ b/arch/x86/src/i486/up_sigdeliver.c
@@ -132,7 +132,7 @@ void up_sigdeliver(void)
 
   /* Then restore the correct state for this thread of execution. */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   up_fullcontextrestore(regs);
 }
 
diff --git a/arch/x86/src/qemu/qemu_handlers.c b/arch/x86/src/qemu/qemu_handlers.c
index 26a2de452ac..0a22d7346f1 100644
--- a/arch/x86/src/qemu/qemu_handlers.c
+++ b/arch/x86/src/qemu/qemu_handlers.c
@@ -173,7 +173,7 @@ uint32_t *isr_handler(uint32_t *regs)
 
   board_autoled_on(LED_INIRQ);
   ret = common_handler((int)regs[REG_IRQNO], regs);
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
   return ret;
 #endif
 }
@@ -220,7 +220,7 @@ uint32_t *irq_handler(uint32_t *regs)
   /* Dispatch the interrupt */
 
   ret = common_handler(irq, regs);
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
   return ret;
 #endif
 }
diff --git a/arch/z16/src/common/up_assert.c b/arch/z16/src/common/up_assert.c
index cf55172dca8..45537de5993 100644
--- a/arch/z16/src/common/up_assert.c
+++ b/arch/z16/src/common/up_assert.c
@@ -100,7 +100,7 @@ static void _up_assert(int errorcode) /* noreturn_function */
 #ifdef CONFIG_ARCH_LEDS
             board_autoled_on(LED_PANIC);
             up_mdelay(250);
-            board_led_off(LED_PANIC);
+            board_autoled_off(LED_PANIC);
             up_mdelay(250);
 #endif
           }
diff --git a/arch/z16/src/common/up_doirq.c b/arch/z16/src/common/up_doirq.c
index 38f89c49e0d..98983538bff 100644
--- a/arch/z16/src/common/up_doirq.c
+++ b/arch/z16/src/common/up_doirq.c
@@ -124,7 +124,7 @@ FAR chipreg_t *up_doirq(int irq, FAR chipreg_t *regs)
       current_regs = savestate;
     }
 
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
 #endif
 
   return ret;
diff --git a/arch/z16/src/common/up_idle.c b/arch/z16/src/common/up_idle.c
index 364fd615e94..01aa0f8d6d8 100644
--- a/arch/z16/src/common/up_idle.c
+++ b/arch/z16/src/common/up_idle.c
@@ -92,7 +92,7 @@ void up_idle(void)
     }
   else if (g_ledtoggle == 0x00)
     {
-      board_led_off(LED_IDLE);
+      board_autoled_off(LED_IDLE);
     }
 #endif
 
diff --git a/arch/z16/src/common/up_sigdeliver.c b/arch/z16/src/common/up_sigdeliver.c
index 893a7661213..0fc52262737 100644
--- a/arch/z16/src/common/up_sigdeliver.c
+++ b/arch/z16/src/common/up_sigdeliver.c
@@ -137,7 +137,7 @@ void up_sigdeliver(void)
 
   /* Then restore the correct state for this thread of execution. */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   SIGNAL_RETURN(regs);
 #endif
 }
diff --git a/arch/z80/src/common/up_assert.c b/arch/z80/src/common/up_assert.c
index f6d92719a5e..a848172b24c 100644
--- a/arch/z80/src/common/up_assert.c
+++ b/arch/z80/src/common/up_assert.c
@@ -99,7 +99,7 @@ static void _up_assert(int errorcode) /* noreturn_function */
 #ifdef CONFIG_ARCH_LEDS
             board_autoled_on(LED_PANIC);
             up_mdelay(250);
-            board_led_off(LED_PANIC);
+            board_autoled_off(LED_PANIC);
             up_mdelay(250);
 #endif
           }
diff --git a/arch/z80/src/common/up_doirq.c b/arch/z80/src/common/up_doirq.c
index bd9d0adbc3b..30e2caf9fd1 100644
--- a/arch/z80/src/common/up_doirq.c
+++ b/arch/z80/src/common/up_doirq.c
@@ -129,7 +129,7 @@ FAR chipreg_t *up_doirq(uint8_t irq, FAR chipreg_t *regs)
       IRQ_LEAVE(irq);
     }
 
-  board_led_off(LED_INIRQ);
+  board_autoled_off(LED_INIRQ);
   return regs;
 #endif
 }
diff --git a/arch/z80/src/common/up_idle.c b/arch/z80/src/common/up_idle.c
index bb6c028a797..43deca5aa0f 100644
--- a/arch/z80/src/common/up_idle.c
+++ b/arch/z80/src/common/up_idle.c
@@ -92,7 +92,7 @@ void up_idle(void)
     }
   else if (g_ledtoggle == 0x00)
     {
-      board_led_off(LED_IDLE);
+      board_autoled_off(LED_IDLE);
     }
 #endif
 
diff --git a/arch/z80/src/ez80/ez80_sigdeliver.c b/arch/z80/src/ez80/ez80_sigdeliver.c
index a9a2e3f3c6d..12db8846aa7 100644
--- a/arch/z80/src/ez80/ez80_sigdeliver.c
+++ b/arch/z80/src/ez80/ez80_sigdeliver.c
@@ -135,7 +135,7 @@ void up_sigdeliver(void)
    * execution.
    */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   ez80_restorecontext(regs);
 #endif
 }
diff --git a/arch/z80/src/z180/z180_sigdeliver.c b/arch/z80/src/z180/z180_sigdeliver.c
index 35b1647f21a..58e9aa9c949 100644
--- a/arch/z80/src/z180/z180_sigdeliver.c
+++ b/arch/z80/src/z180/z180_sigdeliver.c
@@ -132,7 +132,7 @@ void up_sigdeliver(void)
 
   /* Then restore the correct state for this thread of execution. */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   z180_restoreusercontext(regs);
 #endif
 }
diff --git a/arch/z80/src/z8/z8_sigdeliver.c b/arch/z80/src/z8/z8_sigdeliver.c
index ea2a589d301..6605bba7d5e 100644
--- a/arch/z80/src/z8/z8_sigdeliver.c
+++ b/arch/z80/src/z8/z8_sigdeliver.c
@@ -147,7 +147,7 @@ void up_sigdeliver(void)
 
   /* Then restore the correct state for this thread of execution. */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   z8_restorecontext(regs);
 #endif
 }
diff --git a/arch/z80/src/z80/z80_sigdeliver.c b/arch/z80/src/z80/z80_sigdeliver.c
index 0e19072b5fa..4e6dafc0bdc 100644
--- a/arch/z80/src/z80/z80_sigdeliver.c
+++ b/arch/z80/src/z80/z80_sigdeliver.c
@@ -132,7 +132,7 @@ void up_sigdeliver(void)
 
   /* Then restore the correct state for this thread of execution. */
 
-  board_led_off(LED_SIGNAL);
+  board_autoled_off(LED_SIGNAL);
   z80_restoreusercontext(regs);
 #endif
 }