#ifndef CONFIG_NAND_SPL
        bl coloured_LED_init
-       bl red_LED_on
+       bl red_led_on
 #endif
 #endif
 
 
        bne     clbss_l
 
        bl coloured_LED_init
-       bl red_LED_on
+       bl red_led_on
 #endif
 
 /*
 
        saved_state[led] = STATUS_LED_OFF;
 }
 
-void red_LED_on(void)
+void red_led_on(void)
 {
        switch_LED_on(STATUS_LED_RED);
 }
 
-void red_LED_off(void)
+void red_led_off(void)
 {
        switch_LED_off(STATUS_LED_RED);
 }
 
-void green_LED_on(void)
+void green_led_on(void)
 {
        switch_LED_on(STATUS_LED_GREEN);
 }
 
-void green_LED_off(void)
+void green_led_off(void)
 {
        switch_LED_off(STATUS_LED_GREEN);
 }
 {
        if (STATUS_LED_RED == mask) {
                if (STATUS_LED_ON == saved_state[STATUS_LED_RED])
-                       red_LED_off();
+                       red_led_off();
                else
-                       red_LED_on();
+                       red_led_on();
        } else if (STATUS_LED_GREEN == mask) {
                if (STATUS_LED_ON == saved_state[STATUS_LED_GREEN])
-                       green_LED_off();
+                       green_led_off();
                else
-                       green_LED_on();
+                       green_led_on();
        }
 }
 
 {
        if (STATUS_LED_RED == mask) {
                if (STATUS_LED_ON == state)
-                       red_LED_on();
+                       red_led_on();
                else
-                       red_LED_off();
+                       red_led_off();
        } else if (STATUS_LED_GREEN == mask) {
                if (STATUS_LED_ON == state)
-                       green_LED_on();
+                       green_led_on();
                else
-                       green_LED_off();
+                       green_led_off();
        }
 }
 
        str lr, [r1]
 
        /* Turn on both LEDs */
-       bl red_LED_on
-       bl green_LED_on
+       bl red_led_on
+       bl green_led_on
 
        /* Configure flash wait states before we switch to the PLL */
        bl flash_cfg
        bl pll_cfg
 
        /* Turn off the Green LED and leave the Red LED on */
-       bl green_LED_off
+       bl green_led_off
 
        /* Setup SDRAM */
        bl sdram_cfg
 
        /* Turn on Green LED, Turn off the Red LED */
-       bl green_LED_on
-       bl red_LED_off
+       bl green_led_on
+       bl red_led_off
 
        /* FIXME: we use async mode for now */
        mrc p15, 0, r0, c1, c0, 0
 
        bne     clbss_l
 
        bl coloured_LED_init
-       bl red_LED_on
+       bl red_led_on
 #endif
 
 /*
 
        bne     clbss_l
 
        bl coloured_LED_init
-       bl red_LED_on
+       bl red_led_on
 #endif
 
 /*
 
 #include <asm/arch/gpio.h>
 
 #ifdef CONFIG_RED_LED
-void red_LED_on(void)
+void red_led_on(void)
 {
        at91_set_gpio_value(CONFIG_RED_LED, 1);
 }
 
-void red_LED_off(void)
+void red_led_off(void)
 {
        at91_set_gpio_value(CONFIG_RED_LED, 0);
 }
 #endif
 
 #ifdef CONFIG_GREEN_LED
-void green_LED_on(void)
+void green_led_on(void)
 {
        at91_set_gpio_value(CONFIG_GREEN_LED, 0);
 }
 
-void green_LED_off(void)
+void green_led_off(void)
 {
        at91_set_gpio_value(CONFIG_GREEN_LED, 1);
 }
 #endif
 
 #ifdef CONFIG_YELLOW_LED
-void yellow_LED_on(void)
+void yellow_led_on(void)
 {
        at91_set_gpio_value(CONFIG_YELLOW_LED, 0);
 }
 
-void yellow_LED_off(void)
+void yellow_led_off(void)
 {
        at91_set_gpio_value(CONFIG_YELLOW_LED, 1);
 }
 
        bne     clbss_l
 
        bl coloured_LED_init
-       bl red_LED_on
+       bl red_led_on
 #endif
 
 /*
 
        bne     clbss_l
 
        bl coloured_LED_init
-       bl red_LED_on
+       bl red_led_on
 #endif
 
 /*
 
        bne     clbss_l
 
        bl coloured_LED_init
-       bl red_LED_on
+       bl red_led_on
 #endif
 
 /*
 
        bne     clbss_l
 
        bl coloured_LED_init
-       bl red_LED_on
+       bl red_led_on
 #endif
 
 /*
 
 inline void __coloured_LED_init(void) {}
 void coloured_LED_init(void)
        __attribute__((weak, alias("__coloured_LED_init")));
-inline void __red_LED_on(void) {}
-void red_LED_on(void) __attribute__((weak, alias("__red_LED_on")));
-inline void __red_LED_off(void) {}
-void red_LED_off(void) __attribute__((weak, alias("__red_LED_off")));
-inline void __green_LED_on(void) {}
-void green_LED_on(void) __attribute__((weak, alias("__green_LED_on")));
-inline void __green_LED_off(void) {}
-void green_LED_off(void) __attribute__((weak, alias("__green_LED_off")));
-inline void __yellow_LED_on(void) {}
-void yellow_LED_on(void) __attribute__((weak, alias("__yellow_LED_on")));
-inline void __yellow_LED_off(void) {}
-void yellow_LED_off(void) __attribute__((weak, alias("__yellow_LED_off")));
-inline void __blue_LED_on(void) {}
-void blue_LED_on(void) __attribute__((weak, alias("__blue_LED_on")));
-inline void __blue_LED_off(void) {}
-void blue_LED_off(void) __attribute__((weak, alias("__blue_LED_off")));
+inline void __red_led_on(void) {}
+void red_led_on(void) __attribute__((weak, alias("__red_led_on")));
+inline void __red_led_off(void) {}
+void red_led_off(void) __attribute__((weak, alias("__red_led_off")));
+inline void __green_led_on(void) {}
+void green_led_on(void) __attribute__((weak, alias("__green_led_on")));
+inline void __green_led_off(void) {}
+void green_led_off(void) __attribute__((weak, alias("__green_led_off")));
+inline void __yellow_led_on(void) {}
+void yellow_led_on(void) __attribute__((weak, alias("__yellow_led_on")));
+inline void __yellow_led_off(void) {}
+void yellow_led_off(void) __attribute__((weak, alias("__yellow_led_off")));
+inline void __blue_led_on(void) {}
+void blue_led_on(void) __attribute__((weak, alias("__blue_led_on")));
+inline void __blue_led_off(void) {}
+void blue_led_off(void) __attribute__((weak, alias("__blue_led_off")));
 
 /*
  ************************************************************************
 
 #define        YELLOW_LED      (1<<1)
 #define        RED_LED         (1<<2)
 
-void   green_LED_on(void)
+void   green_led_on(void)
 {
        at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
        writel(GREEN_LED, &pio->piob.codr);
 }
 
-void    yellow_LED_on(void)
+void    yellow_led_on(void)
 {
        at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
        writel(YELLOW_LED, &pio->piob.codr);
 }
 
-void    red_LED_on(void)
+void    red_led_on(void)
 {
        at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
        writel(RED_LED, &pio->piob.codr);
 }
 
-void   green_LED_off(void)
+void   green_led_off(void)
 {
        at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
        writel(GREEN_LED, &pio->piob.sodr);
 }
 
-void   yellow_LED_off(void)
+void   yellow_led_off(void)
 {
        at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
        writel(YELLOW_LED, &pio->piob.sodr);
 }
 
-void   red_LED_off(void)
+void   red_led_off(void)
 {
        at91_pio_t *pio = (at91_pio_t *)ATMEL_BASE_PIO;
        writel(RED_LED, &pio->piob.sodr);
 
        at91_set_pio_value(CONFIG_BLUE_LED, 1);
 }
 
-void red_LED_off(void)
+void red_led_off(void)
 {
        at91_set_pio_value(CONFIG_RED_LED, 1);
        saved_state[STATUS_LED_RED] = STATUS_LED_OFF;
 }
 
-void green_LED_off(void)
+void green_led_off(void)
 {
        at91_set_pio_value(CONFIG_GREEN_LED, 1);
        saved_state[STATUS_LED_GREEN] = STATUS_LED_OFF;
 }
 
-void yellow_LED_off(void)
+void yellow_led_off(void)
 {
        at91_set_pio_value(CONFIG_YELLOW_LED, 1);
        saved_state[STATUS_LED_YELLOW] = STATUS_LED_OFF;
 }
 
-void blue_LED_off(void)
+void blue_led_off(void)
 {
        at91_set_pio_value(CONFIG_BLUE_LED, 1);
        saved_state[STATUS_LED_BLUE] = STATUS_LED_OFF;
 }
 
-void red_LED_on(void)
+void red_led_on(void)
 {
        at91_set_pio_value(CONFIG_RED_LED, 0);
        saved_state[STATUS_LED_RED] = STATUS_LED_ON;
 }
 
-void green_LED_on(void)
+void green_led_on(void)
 {
        at91_set_pio_value(CONFIG_GREEN_LED, 0);
        saved_state[STATUS_LED_GREEN] = STATUS_LED_ON;
 }
 
-void yellow_LED_on(void)
+void yellow_led_on(void)
 {
        at91_set_pio_value(CONFIG_YELLOW_LED, 0);
        saved_state[STATUS_LED_YELLOW] = STATUS_LED_ON;
 }
 
-void blue_LED_on(void)
+void blue_led_on(void)
 {
        at91_set_pio_value(CONFIG_BLUE_LED, 0);
        saved_state[STATUS_LED_BLUE] = STATUS_LED_ON;
 {
        if (STATUS_LED_BLUE == mask) {
                if (STATUS_LED_ON == saved_state[STATUS_LED_BLUE])
-                       blue_LED_off();
+                       blue_led_off();
                else
-                       blue_LED_on();
+                       blue_led_on();
        } else if (STATUS_LED_RED == mask) {
                if (STATUS_LED_ON == saved_state[STATUS_LED_RED])
-                       red_LED_off();
+                       red_led_off();
                else
-                       red_LED_on();
+                       red_led_on();
        } else if (STATUS_LED_GREEN == mask) {
                if (STATUS_LED_ON == saved_state[STATUS_LED_GREEN])
-                       green_LED_off();
+                       green_led_off();
                else
-                       green_LED_on();
+                       green_led_on();
        } else if (STATUS_LED_YELLOW == mask) {
                if (STATUS_LED_ON == saved_state[STATUS_LED_YELLOW])
-                       yellow_LED_off();
+                       yellow_led_off();
                else
-                       yellow_LED_on();
+                       yellow_led_on();
        }
 }
 
 {
        if (STATUS_LED_BLUE == mask) {
                if (STATUS_LED_ON == state)
-                       blue_LED_on();
+                       blue_led_on();
                else
-                       blue_LED_off();
+                       blue_led_off();
        } else if (STATUS_LED_RED == mask) {
                if (STATUS_LED_ON == state)
-                       red_LED_on();
+                       red_led_on();
                else
-                       red_LED_off();
+                       red_led_off();
        } else if (STATUS_LED_GREEN == mask) {
                if (STATUS_LED_ON == state)
-                       green_LED_on();
+                       green_led_on();
                else
-                       green_LED_off();
+                       green_led_off();
        } else if (STATUS_LED_YELLOW == mask) {
                if (STATUS_LED_ON == state)
-                       yellow_LED_on();
+                       yellow_led_on();
                else
-                       yellow_LED_off();
+                       yellow_led_off();
        }
 }
 
 #define ZOOM2_LED_BLUE 154
 #define ZOOM2_LED_BLUE2        61
 
-void red_LED_off (void)
+void red_led_off(void)
 {
        /* red */
        if (!gpio_request(ZOOM2_LED_RED, "")) {
        saved_state[STATUS_LED_RED] = STATUS_LED_OFF;
 }
 
-void blue_LED_off (void)
+void blue_led_off(void)
 {
        /* blue */
        if (!gpio_request(ZOOM2_LED_BLUE, "")) {
        saved_state[STATUS_LED_BLUE] = STATUS_LED_OFF;
 }
 
-void red_LED_on (void)
+void red_led_on(void)
 {
-       blue_LED_off ();
+       blue_led_off();
 
        /* red */
        if (!gpio_request(ZOOM2_LED_RED, "")) {
        saved_state[STATUS_LED_RED] = STATUS_LED_ON;
 }
 
-void blue_LED_on (void)
+void blue_led_on(void)
 {
-       red_LED_off ();
+       red_led_off();
 
        /* blue */
        if (!gpio_request(ZOOM2_LED_BLUE, "")) {
 {
        if (STATUS_LED_BLUE == mask) {
                if (STATUS_LED_ON == saved_state[STATUS_LED_BLUE])
-                       blue_LED_off ();
+                       blue_led_off();
                else
-                       blue_LED_on ();
+                       blue_led_on();
        } else if (STATUS_LED_RED == mask) {
                if (STATUS_LED_ON == saved_state[STATUS_LED_RED])
-                       red_LED_off ();
+                       red_led_off();
                else
-                       red_LED_on ();
+                       red_led_on();
        }
 }
 
 {
        if (STATUS_LED_BLUE == mask) {
                if (STATUS_LED_ON == state)
-                       blue_LED_on ();
+                       blue_led_on();
                else
-                       blue_LED_off ();
+                       blue_led_off();
        } else if (STATUS_LED_RED == mask) {
                if (STATUS_LED_ON == state)
-                       red_LED_on ();
+                       red_led_on();
                else
-                       red_LED_off ();
+                       red_led_off();
        }
 }
 
 #define BEAGLE_LED_USR1        149
 
 #ifdef STATUS_LED_GREEN
-void green_LED_off (void)
+void green_led_off(void)
 {
        __led_set (STATUS_LED_GREEN, 0);
 }
 
-void green_LED_on (void)
+void green_led_on(void)
 {
        __led_set (STATUS_LED_GREEN, 1);
 }
 
 #endif
 #endif
 #ifdef STATUS_LED_GREEN
-       { "green", STATUS_LED_GREEN, green_LED_off, green_LED_on, NULL },
+       { "green", STATUS_LED_GREEN, green_led_off, green_led_on, NULL },
 #endif
 #ifdef STATUS_LED_YELLOW
-       { "yellow", STATUS_LED_YELLOW, yellow_LED_off, yellow_LED_on, NULL },
+       { "yellow", STATUS_LED_YELLOW, yellow_led_off, yellow_led_on, NULL },
 #endif
 #ifdef STATUS_LED_RED
-       { "red", STATUS_LED_RED, red_LED_off, red_LED_on, NULL },
+       { "red", STATUS_LED_RED, red_led_off, red_led_on, NULL },
 #endif
 #ifdef STATUS_LED_BLUE
-       { "blue", STATUS_LED_BLUE, blue_LED_off, blue_LED_on, NULL },
+       { "blue", STATUS_LED_BLUE, blue_led_off, blue_led_on, NULL },
 #endif
        { NULL, 0, NULL, NULL, NULL }
 };
 
  */
 #ifndef        __ASSEMBLY__
 extern void    coloured_LED_init (void);
-extern void    red_LED_on(void);
-extern void    red_LED_off(void);
-extern void    green_LED_on(void);
-extern void    green_LED_off(void);
-extern void    yellow_LED_on(void);
-extern void    yellow_LED_off(void);
-extern void    blue_LED_on(void);
-extern void    blue_LED_off(void);
+extern void    red_led_on(void);
+extern void    red_led_off(void);
+extern void    green_led_on(void);
+extern void    green_led_off(void);
+extern void    yellow_led_on(void);
+extern void    yellow_led_off(void);
+extern void    blue_led_on(void);
+extern void    blue_led_off(void);
 #else
        .extern LED_init
-       .extern red_LED_on
-       .extern red_LED_off
-       .extern yellow_LED_on
-       .extern yellow_LED_off
-       .extern green_LED_on
-       .extern green_LED_off
-       .extern blue_LED_on
-       .extern blue_LED_off
+       .extern red_led_on
+       .extern red_led_off
+       .extern yellow_led_on
+       .extern yellow_led_off
+       .extern green_led_on
+       .extern green_led_off
+       .extern blue_led_on
+       .extern blue_led_off
 #endif
 
 #endif /* CONFIG_STATUS_LED    */