diff --git a/configs/amber/src/up_boot.c b/configs/amber/src/up_boot.c
index 94568fbce2a..b0b5656e8bc 100644
--- a/configs/amber/src/up_boot.c
+++ b/configs/amber/src/up_boot.c
@@ -1,7 +1,7 @@
 /************************************************************************************
  * configs/amber/src/up_boot.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@
 #include "amber_internal.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
@@ -62,16 +62,16 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_boardinitialize
+ * Name: atmega_boardinitialize
  *
  * Description:
  *   All ATMega architectures must provide the following entry point.  This entry
- *   point is called early in the intitialization -- after all memory has been
+ *   point is called early in the initialization -- after all memory has been
  *   configured and mapped but before any devices have been initialized.
  *
  ************************************************************************************/
 
-void up_boardinitialize(void)
+void atmega_boardinitialize(void)
 {
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
    * function atmega_spiinitialize() has been brought into the link.
diff --git a/configs/avr32dev1/src/up_boot.c b/configs/avr32dev1/src/up_boot.c
index 0763ecfcf65..75f0e9e71ac 100644
--- a/configs/avr32dev1/src/up_boot.c
+++ b/configs/avr32dev1/src/up_boot.c
@@ -63,16 +63,16 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_boardinitialize
+ * Name: at32uc3_boardinitialize
  *
  * Description:
- *   All AVR32 architectures must provide the following entry point.  This entry point
- *   is called early in the intitialization -- after all memory has been configured
- *   and mapped but before any devices have been initialized.
+ *   All AVR32 AT32UC3 architectures must provide the following entry point.  This
+ *   entry point is called early in the initialization -- after all memory has been
+ *   configured and mapped but before any devices have been initialized.
  *
  ************************************************************************************/
 
-void up_boardinitialize(void)
+void at32uc3_boardinitialize(void)
 {
   /* Configure SPI chip selects */
 
diff --git a/configs/micropendous3/src/up_boot.c b/configs/micropendous3/src/up_boot.c
index 912440c192c..9a9e80f32d9 100644
--- a/configs/micropendous3/src/up_boot.c
+++ b/configs/micropendous3/src/up_boot.c
@@ -1,8 +1,7 @@
 /************************************************************************************
  * configs/micropendous3/src/up_boot.c
- * arch/mips/src/board/up_boot.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -51,7 +50,7 @@
 #include "micropendous3_internal.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
@@ -63,16 +62,16 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_boardinitialize
+ * Name: at90usb_boardinitialize
  *
  * Description:
  *   All AT90USB architectures must provide the following entry point.  This entry
- *   point is called early in the intitialization -- after all memory has been
+ *   point is called early in the initialization -- after all memory has been
  *   configured and mapped but before any devices have been initialized.
  *
  ************************************************************************************/
 
-void up_boardinitialize(void)
+void at90usb_boardinitialize(void)
 {
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
    * function at90usb_spiinitialize() has been brought into the link.
diff --git a/configs/moteino-mega/src/avr_boot.c b/configs/moteino-mega/src/avr_boot.c
index e38da636bd0..00163a0f79a 100644
--- a/configs/moteino-mega/src/avr_boot.c
+++ b/configs/moteino-mega/src/avr_boot.c
@@ -62,7 +62,7 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_boardinitialize
+ * Name: atmega_boardinitialize
  *
  * Description:
  *   All ATMega architectures must provide the following entry point.  This entry
@@ -71,7 +71,7 @@
  *
  ************************************************************************************/
 
-void up_boardinitialize(void)
+void atmega_boardinitialize(void)
 {
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
    * function atmega_spiinitialize() has been brought into the link.
diff --git a/configs/qemu-i486/include/board.h b/configs/qemu-i486/include/board.h
index 4dcd9d7a8b9..bf671acc473 100644
--- a/configs/qemu-i486/include/board.h
+++ b/configs/qemu-i486/include/board.h
@@ -72,7 +72,8 @@
 #undef EXTERN
 #if defined(__cplusplus)
 #define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
 #else
 #define EXTERN extern
 #endif
@@ -80,17 +81,6 @@ extern "C" {
 /************************************************************************************
  * Public Function Prototypes
  ************************************************************************************/
-/************************************************************************************
- * Name: up_boardinitialize
- *
- * Description:
- *   All x86 architectures must provide the following entry point.  This entry point
- *   is called early in the intitialization -- after all memory has been configured
- *   and mapped but before any devices have been initialized.
- *
- ************************************************************************************/
-
-EXTERN void up_boardinitialize(void);
 
 #undef EXTERN
 #if defined(__cplusplus)
diff --git a/configs/qemu-i486/src/qemu_boot.c b/configs/qemu-i486/src/qemu_boot.c
index 27b05b39725..8f43ebf9175 100644
--- a/configs/qemu-i486/src/qemu_boot.c
+++ b/configs/qemu-i486/src/qemu_boot.c
@@ -63,16 +63,16 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_boardinitialize
+ * Name: x86_boardinitialize
  *
  * Description:
  *   All x86 architectures must provide the following entry point.  This entry point
- *   is called early in the intitialization -- after all memory has been configured
+ *   is called early in the initialization -- after all memory has been configured
  *   and mapped but before any devices have been initialized.
  *
  ************************************************************************************/
 
-void up_boardinitialize(void)
+void x86_boardinitialize(void)
 {
   /* Configure on-board LEDs if LED support has been selected. */
 
diff --git a/configs/teensy/src/up_boot.c b/configs/teensy/src/up_boot.c
index 7c881127243..8764949c99d 100644
--- a/configs/teensy/src/up_boot.c
+++ b/configs/teensy/src/up_boot.c
@@ -1,8 +1,7 @@
 /************************************************************************************
  * configs/teensy/src/up_boot.c
- * arch/mips/src/board/up_boot.c
  *
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,16 +62,16 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_boardinitialize
+ * Name: at90usb_boardinitialize
  *
  * Description:
  *   All AT90USB architectures must provide the following entry point.  This entry
- *   point is called early in the intitialization -- after all memory has been
+ *   point is called early in the initialization -- after all memory has been
  *   configured and mapped but before any devices have been initialized.
  *
  ************************************************************************************/
 
-void up_boardinitialize(void)
+void at90usb_boardinitialize(void)
 {
   /* Configure SSP chip selects if 1) at least one SSP is enabled, and 2) the weak
    * function at90usb_spiinitialize() has been brought into the link.