diff --git a/configs/ea3131/locked/mklocked.sh b/configs/ea3131/locked/mklocked.sh
index 776247997d..ff648d7b73 100755
--- a/configs/ea3131/locked/mklocked.sh
+++ b/configs/ea3131/locked/mklocked.sh
@@ -115,7 +115,7 @@ echo "EXTERN(up_vectoraddrexcptn)" >>ld-locked.inc
 #
 # Of course, this list must be extended as interrupt handlers are added.
 
-echo "EXTERN(up_timerinit)" >>ld-locked.inc
+echo "EXTERN(up_timer_initialize)" >>ld-locked.inc
 
 answer=$(checkconfig CONFIG_LPC31_UART)
 if [ $answer = y ]; then
diff --git a/configs/viewtool-stm32f107/README.txt b/configs/viewtool-stm32f107/README.txt
index fec00aa26d..ea7d10e2a4 100644
--- a/configs/viewtool-stm32f107/README.txt
+++ b/configs/viewtool-stm32f107/README.txt
@@ -696,7 +696,7 @@ Configurations
             CONFIG_EXAMPLES_NXLINES_CIRCLECOLOR=0xf7bb
             CONFIG_EXAMPLES_NXLINES_BPP=16
 
-       STATUS: Now working; reads 0x8999 as device ID.  This may perhaps
+       STATUS: Not working; reads 0x8999 as device ID.  This may perhaps
                be due to incorrect jumper settings
 
     6. This configuration has been used for verifying the touchscreen on
diff --git a/configs/xtrs/src/xtr_irq.c b/configs/xtrs/src/xtr_irq.c
index 1180149cdb..6603cfaec6 100644
--- a/configs/xtrs/src/xtr_irq.c
+++ b/configs/xtrs/src/xtr_irq.c
@@ -77,7 +77,7 @@ void up_irqinitialize(void)
    *
    * NOTE:  Normally, there are seperate enables for "global" interrupts
    * and specific device interrupts.  In such a "normal" case, the timer
-   * interrupt should be attached and enabled in the function up_timerinit()
+   * interrupt should be attached and enabled in the function up_timer_initialize()
    */
 
   irq_attach(Z80_IRQ_SYSTIMER, (xcpt_t)up_timerisr);
diff --git a/configs/xtrs/src/xtr_timerisr.c b/configs/xtrs/src/xtr_timerisr.c
index 295bc65d78..893a41493e 100644
--- a/configs/xtrs/src/xtr_timerisr.c
+++ b/configs/xtrs/src/xtr_timerisr.c
@@ -80,7 +80,7 @@ int up_timerisr(int irq, FAR chipreg_t *regs)
 }
 
 /****************************************************************************
- * Function:  up_timerinit
+ * Function:  up_timer_initialize
  *
  * Description:
  *   This function is called during start-up to initialize the timer
@@ -88,7 +88,7 @@ int up_timerisr(int irq, FAR chipreg_t *regs)
  *
  ****************************************************************************/
 
-void up_timerinit(void)
+void up_timer_initialize(void)
 {
   /* The timer interrupt was attached in up_irqinitialize -- see comments there */
 }
diff --git a/configs/z80sim/src/z80_irq.c b/configs/z80sim/src/z80_irq.c
index 7611dc29e7..45d4eb962e 100644
--- a/configs/z80sim/src/z80_irq.c
+++ b/configs/z80sim/src/z80_irq.c
@@ -77,7 +77,7 @@ void up_irqinitialize(void)
    *
    * NOTE:  Normally, there are seperate enables for "global" interrupts
    * and specific device interrupts.  In such a "normal" case, the timer
-   * interrupt should be attached and enabled in the function up_timerinit()
+   * interrupt should be attached and enabled in the function up_timer_initialize()
    */
 
   irq_attach(Z80_IRQ_SYSTIMER, (xcpt_t)up_timerisr);
diff --git a/configs/z80sim/src/z80_timerisr.c b/configs/z80sim/src/z80_timerisr.c
index e6357e8e0b..51ae04add9 100644
--- a/configs/z80sim/src/z80_timerisr.c
+++ b/configs/z80sim/src/z80_timerisr.c
@@ -80,7 +80,7 @@ int up_timerisr(int irq, FAR chipreg_t *regs)
 }
 
 /****************************************************************************
- * Function:  up_timerinit
+ * Function:  up_timer_initialize
  *
  * Description:
  *   This function is called during start-up to initialize the timer
@@ -88,7 +88,7 @@ int up_timerisr(int irq, FAR chipreg_t *regs)
  *
  ****************************************************************************/
 
-void up_timerinit(void)
+void up_timer_initialize(void)
 {
   /* The timer interrupt was attached in up_irqinitialize -- see comments there */
 }