diff --git a/configs/stm3210e-eval/src/Makefile b/configs/stm3210e-eval/src/Makefile
index b84a943860..2624e3a310 100644
--- a/configs/stm3210e-eval/src/Makefile
+++ b/configs/stm3210e-eval/src/Makefile
@@ -35,71 +35,71 @@
 
 -include $(TOPDIR)/Make.defs
 
-CFLAGS		+= -I$(TOPDIR)/sched
+CFLAGS += -I$(TOPDIR)/sched
 
-ASRCS		=
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
+ASRCS =
+AOBJS = $(ASRCS:.S=$(OBJEXT))
 
-CSRCS		= up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c
+CSRCS = stm32_boot.c stm32_leds.c stm32_buttons.c stm32_spi.c stm32_usbdev.c
 
 ifeq ($(CONFIG_STM32_FSMC),y)
-CSRCS		+= up_lcd.c up_extcontext.c up_extmem.c up_selectnor.c \
-			  up_deselectnor.c up_selectsram.c up_deselectsram.c \
-			  up_selectlcd.c up_deselectlcd.c
+CSRCS += stm32_lcd.c stm32_extcontext.c stm32_extmem.c stm32_selectnor.c
+CSRCS += stm32_deselectnor.c stm32_selectsram.c stm32_deselectsram.c
+CSRCS += stm32_selectlcd.c stm32_deselectlcd.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS		+= up_nsh.c
+CSRCS += stm32_nsh.c
 endif
 
 ifeq ($(CONFIG_ADC),y)
-CSRCS		+= up_adc.c
+CSRCS += stm32_adc.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
-CSRCS		+= up_usbmsc.c
+CSRCS += stm32_usbmsc.c
 endif
 
 ifeq ($(CONFIG_USBDEV_COMPOSITE),y)
-CSRCS		+= up_composite.c
+CSRCS += stm32_composite.c
 endif
 
 ifeq ($(CONFIG_I2C_LM75),y)
-CSRCS		+= up_lm75.c
+CSRCS += stm32_lm75.c
 endif
 
 ifeq ($(CONFIG_CAN),y)
-CSRCS		+= up_can.c
+CSRCS += stm32_can.c
 endif
 
 ifeq ($(CONFIG_WATCHDOG),y)
-CSRCS		+= up_watchdog.c
+CSRCS += stm32_watchdog.c
 endif
 
 ifeq ($(CONFIG_ARCH_CUSTOM_PMINIT),y)
-CSRCS		+= up_pm.c
+CSRCS += stm32_pm.c
 endif
 
 ifeq ($(CONFIG_PM_BUTTONS),y)
-CSRCS		+= up_pmbuttons.c
+CSRCS += stm32_pmbuttons.c
 endif
 
 ifeq ($(CONFIG_ARCH_IDLE_CUSTOM),y)
-CSRCS		+= up_idle.c
+CSRCS += stm32_idle.c
 endif
 
-COBJS		= $(CSRCS:.c=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
 
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
 
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
+ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 ifeq ($(WINTOOL),y)
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
+  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
 else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
+  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
 endif
 
 all: libboard$(LIBEXT)
diff --git a/configs/stm3210e-eval/src/stm3210e-internal.h b/configs/stm3210e-eval/src/stm3210e-eval.h
similarity index 96%
rename from configs/stm3210e-eval/src/stm3210e-internal.h
rename to configs/stm3210e-eval/src/stm3210e-eval.h
index fb2180d593..a210def03f 100644
--- a/configs/stm3210e-eval/src/stm3210e-internal.h
+++ b/configs/stm3210e-eval/src/stm3210e-eval.h
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e_eval/src/stm3210e_internal.h
- * arch/arm/src/board/stm3210e_internal.n
+ * configs/stm3210e_eval/src/stm3210e-eval.h
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -34,8 +33,8 @@
  *
  ************************************************************************************/
 
-#ifndef __CONFIGS_STM3210E_EVAL_SRC_STM3210E_INTERNAL_H
-#define __CONFIGS_STM3210E_EVAL_SRC_STM3210E_INTERNAL_H
+#ifndef __CONFIGS_STM3210E_EVAL_SRC_STM3210E_EVAL_H
+#define __CONFIGS_STM3210E_EVAL_SRC_STM3210E_EVAL_H
 
 /************************************************************************************
  * Included Files
@@ -46,7 +45,7 @@
 #include <stdint.h>
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* How many SPI modules does this chip support? Most support 2 SPI modules (others
@@ -293,7 +292,7 @@ void stm32_deselectlcd(void);
 #endif /* CONFIG_STM32_FSMC */
 
 /************************************************************************************
- * Name: up_ledpminitialize
+ * Name: stm32_ledpminitialize
  *
  * Description:
  *   Register the LEDs to receive power management event callbacks
@@ -301,11 +300,11 @@ void stm32_deselectlcd(void);
  ************************************************************************************/
 
 #if defined(CONFIG_PM) && defined(CONFIG_ARCH_LEDS)
-void up_ledpminitialize(void);
+void stm32_ledpminitialize(void);
 #endif
 
 /************************************************************************************
- * Name: up_pmbuttons
+ * Name: stm32_pmbuttons
  *
  * Description:
  *   Configure all the buttons of the STM3210e-eval board as EXTI, so any button is
@@ -314,9 +313,9 @@ void up_ledpminitialize(void);
  ************************************************************************************/
 
 #if defined(CONFIG_PM) && defined(CONFIG_ARCH_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS)
-void up_pmbuttons(void);
+void stm32_pmbuttons(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __CONFIGS_STM3210E_EVAL_SRC_STM3210E_INTERNAL_H */
+#endif /* __CONFIGS_STM3210E_EVAL_SRC_STM3210E_EVAL_H */
 
diff --git a/configs/stm3210e-eval/src/up_adc.c b/configs/stm3210e-eval/src/stm32_adc.c
similarity index 98%
rename from configs/stm3210e-eval/src/up_adc.c
rename to configs/stm3210e-eval/src/stm32_adc.c
index c7c7e0c0a4..5bd4090237 100644
--- a/configs/stm3210e-eval/src/up_adc.c
+++ b/configs/stm3210e-eval/src/stm32_adc.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e-eval/src/up_adc.c
- * arch/arm/src/board/up_adc.c
+ * configs/stm3210e-eval/src/stm32_adc.c
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +49,7 @@
 #include "up_arch.h"
 
 #include "stm32_pwm.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 #ifdef CONFIG_ADC
 
diff --git a/configs/stm3210e-eval/src/up_boot.c b/configs/stm3210e-eval/src/stm32_boot.c
similarity index 97%
rename from configs/stm3210e-eval/src/up_boot.c
rename to configs/stm3210e-eval/src/stm32_boot.c
index 16e8f22e2c..d42451cae5 100644
--- a/configs/stm3210e-eval/src/up_boot.c
+++ b/configs/stm3210e-eval/src/stm32_boot.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e-eval/src/up_boot.c
- * arch/arm/src/board/up_boot.c
+ * configs/stm3210e-eval/src/stm32_boot.c
  *
  *   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +44,7 @@
 #include <arch/board/board.h>
 
 #include "up_arch.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 /************************************************************************************
  * Definitions
diff --git a/configs/stm3210e-eval/src/up_buttons.c b/configs/stm3210e-eval/src/stm32_buttons.c
similarity index 98%
rename from configs/stm3210e-eval/src/up_buttons.c
rename to configs/stm3210e-eval/src/stm32_buttons.c
index d3bf391ea7..845eb54361 100644
--- a/configs/stm3210e-eval/src/up_buttons.c
+++ b/configs/stm3210e-eval/src/stm32_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm3210e-eval/src/board_buttons.c
+ * configs/stm3210e-eval/src/stm32_buttons.c
  *
  *   Copyright (C) 2009, 2011, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 #include <arch/board/board.h>
 
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 #ifdef CONFIG_ARCH_BUTTONS
 
diff --git a/configs/stm3210e-eval/src/up_can.c b/configs/stm3210e-eval/src/stm32_can.c
similarity index 97%
rename from configs/stm3210e-eval/src/up_can.c
rename to configs/stm3210e-eval/src/stm32_can.c
index 8868c9324f..c356524516 100644
--- a/configs/stm3210e-eval/src/up_can.c
+++ b/configs/stm3210e-eval/src/stm32_can.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e-eval/src/up_can.c
- * arch/arm/src/board/up_can.c
+ * configs/stm3210e-eval/src/stm32_can.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +50,7 @@
 
 #include "stm32.h"
 #include "stm32_can.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 #if defined(CONFIG_CAN) && defined(CONFIG_STM32_CAN1)
 
diff --git a/configs/stm3210e-eval/src/up_composite.c b/configs/stm3210e-eval/src/stm32_composite.c
similarity index 98%
rename from configs/stm3210e-eval/src/up_composite.c
rename to configs/stm3210e-eval/src/stm32_composite.c
index 2581d8213f..33118ee586 100644
--- a/configs/stm3210e-eval/src/up_composite.c
+++ b/configs/stm3210e-eval/src/stm32_composite.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm3210e-eval/src/up_composite.c
+ * configs/stm3210e-eval/src/stm32_composite.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -90,7 +90,7 @@
 int composite_archinitialize(void)
 {
   /* If system/composite is built as an NSH command, then SD slot should
-   * already have been initialized in nsh_archinitialize() (see up_nsh.c).  In
+   * already have been initialized in nsh_archinitialize() (see stm32_nsh.c).  In
    * this case, there is nothing further to be done here.
    *
    * NOTE: CONFIG_NSH_BUILTIN_APPS is not a fool-proof indication that NSH
diff --git a/configs/stm3210e-eval/src/up_deselectlcd.c b/configs/stm3210e-eval/src/stm32_deselectlcd.c
similarity index 96%
rename from configs/stm3210e-eval/src/up_deselectlcd.c
rename to configs/stm3210e-eval/src/stm32_deselectlcd.c
index e81429f3f7..b9c155e3db 100644
--- a/configs/stm3210e-eval/src/up_deselectlcd.c
+++ b/configs/stm3210e-eval/src/stm32_deselectlcd.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e-eval/src/up_deselectlcd.c
- * arch/arm/src/board/up_deselectlcd.c
+ * configs/stm3210e-eval/src/stm32_deselectlcd.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,7 +43,7 @@
 
 #include "up_arch.h"
 #include "stm32_fsmc.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 #ifdef CONFIG_STM32_FSMC
 
diff --git a/configs/stm3210e-eval/src/up_deselectnor.c b/configs/stm3210e-eval/src/stm32_deselectnor.c
similarity index 96%
rename from configs/stm3210e-eval/src/up_deselectnor.c
rename to configs/stm3210e-eval/src/stm32_deselectnor.c
index 3aeebb371e..a46fb9bde2 100644
--- a/configs/stm3210e-eval/src/up_deselectnor.c
+++ b/configs/stm3210e-eval/src/stm32_deselectnor.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e-eval/src/up_deselectnor.c
- * arch/arm/src/board/up_deselectnor.c
+ * configs/stm3210e-eval/src/stm32_deselectnor.c
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,7 +43,7 @@
 
 #include "up_arch.h"
 #include "stm32_fsmc.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 #ifdef CONFIG_STM32_FSMC
 
diff --git a/configs/stm3210e-eval/src/up_deselectsram.c b/configs/stm3210e-eval/src/stm32_deselectsram.c
similarity index 96%
rename from configs/stm3210e-eval/src/up_deselectsram.c
rename to configs/stm3210e-eval/src/stm32_deselectsram.c
index 11e51c2734..a57cab1f6a 100644
--- a/configs/stm3210e-eval/src/up_deselectsram.c
+++ b/configs/stm3210e-eval/src/stm32_deselectsram.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e-eval/src/up_deselectsram.c
- * arch/arm/src/board/up_deselectsram.c
+ * configs/stm3210e-eval/src/stm32_deselectsram.c
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,7 +43,7 @@
 
 #include "up_arch.h"
 #include "stm32_fsmc.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 #ifdef CONFIG_STM32_FSMC
 
diff --git a/configs/stm3210e-eval/src/up_extcontext.c b/configs/stm3210e-eval/src/stm32_extcontext.c
similarity index 97%
rename from configs/stm3210e-eval/src/up_extcontext.c
rename to configs/stm3210e-eval/src/stm32_extcontext.c
index 07a202f06d..9f2155402b 100644
--- a/configs/stm3210e-eval/src/up_extcontext.c
+++ b/configs/stm3210e-eval/src/stm32_extcontext.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e-eval/src/up_extcontext.c
- * arch/arm/src/board/up_extcontext.c
+ * configs/stm3210e-eval/src/stm32_extcontext.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -46,7 +45,7 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 #ifdef CONFIG_STM32_FSMC
 
diff --git a/configs/stm3210e-eval/src/up_extmem.c b/configs/stm3210e-eval/src/stm32_extmem.c
similarity index 98%
rename from configs/stm3210e-eval/src/up_extmem.c
rename to configs/stm3210e-eval/src/stm32_extmem.c
index d76114abee..27602797b3 100644
--- a/configs/stm3210e-eval/src/up_extmem.c
+++ b/configs/stm3210e-eval/src/stm32_extmem.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e-eval/src/up_extmem.c
- * arch/arm/src/board/up_extmem.c
+ * configs/stm3210e-eval/src/stm32_extmem.c
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +51,7 @@
 #include "stm32_fsmc.h"
 #include "stm32_gpio.h"
 #include "stm32.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/configs/stm3210e-eval/src/up_idle.c b/configs/stm3210e-eval/src/stm32_idle.c
similarity index 95%
rename from configs/stm3210e-eval/src/up_idle.c
rename to configs/stm3210e-eval/src/stm32_idle.c
index c270b6ed4b..84d6032cd4 100644
--- a/configs/stm3210e-eval/src/up_idle.c
+++ b/configs/stm3210e-eval/src/stm32_idle.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/stm3210e-eval/src/up_idle.c
- * arch/arm/src/board/up_idle.c
+ * configs/stm3210e-eval/src/stm32_idle.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -57,7 +56,7 @@
 #include "stm32_rcc.h"
 #include "stm32_exti.h"
 
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -135,7 +134,7 @@ static volatile bool g_alarmwakeup;               /* Wakeup Alarm indicator */
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_alarmcb
+ * Name: stm32_alarmcb
  *
  * Description:
  *    RTC alarm callback
@@ -143,7 +142,7 @@ static volatile bool g_alarmwakeup;               /* Wakeup Alarm indicator */
  ****************************************************************************/
 
 #if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM)
-static void up_alarmcb(void)
+static void stm32_alarmcb(void)
 {
   /* Note that we were awaken by an alarm */
 
@@ -152,7 +151,7 @@ static void up_alarmcb(void)
 #endif
 
 /****************************************************************************
- * Name: up_alarm_exti
+ * Name: stm32_alarm_exti
  *
  * Description:
  *    RTC alarm EXTI interrupt service routine
@@ -160,15 +159,15 @@ static void up_alarmcb(void)
  ****************************************************************************/
 
 #if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM)
-static int up_alarm_exti(int irq, FAR void *context)
+static int stm32_alarm_exti(int irq, FAR void *context)
 {
-  up_alarmcb();
+  stm32_alarmcb();
   return OK;
 }
 #endif
 
 /****************************************************************************
- * Name: up_exti_cancel
+ * Name: stm32_exti_cancel
  *
  * Description:
  *    Disable the ALARM EXTI interrupt
@@ -176,14 +175,14 @@ static int up_alarm_exti(int irq, FAR void *context)
  ****************************************************************************/
 
 #if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM)
-static void up_exti_cancel(void)
+static void stm32_exti_cancel(void)
 {
   (void)stm32_exti_alarm(false, false, false, NULL);
 }
 #endif
 
 /****************************************************************************
- * Name: up_rtc_alarm
+ * Name: stm32_rtc_alarm
  *
  * Description:
  *   Set the alarm
@@ -191,7 +190,7 @@ static void up_exti_cancel(void)
  ****************************************************************************/
 
 #if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM)
-static int up_rtc_alarm(time_t tv_sec, time_t tv_nsec, bool exti)
+static int stm32_rtc_alarm(time_t tv_sec, time_t tv_nsec, bool exti)
 {
   struct timespec alarmtime;
   int ret;
@@ -202,7 +201,7 @@ static int up_rtc_alarm(time_t tv_sec, time_t tv_nsec, bool exti)
     {
       /* TODO: Make sure that that is no pending EXTI interrupt */
 
-      (void)stm32_exti_alarm(true, true, true, up_alarm_exti);
+      (void)stm32_exti_alarm(true, true, true, stm32_alarm_exti);
     }
 
   /* Configure the RTC alarm to Auto Wake the system */
@@ -227,7 +226,7 @@ static int up_rtc_alarm(time_t tv_sec, time_t tv_nsec, bool exti)
   /* Set the alarm */
 
   g_alarmwakeup = false;
-  ret = up_rtc_setalarm(&alarmtime, up_alarmcb);
+  ret = up_rtc_setalarm(&alarmtime, stm32_alarmcb);
   if (ret < 0)
     {
       lldbg("Warning: The alarm is already set\n");
@@ -238,7 +237,7 @@ static int up_rtc_alarm(time_t tv_sec, time_t tv_nsec, bool exti)
 #endif
 
 /****************************************************************************
- * Name: up_idlepm
+ * Name: stm32_idlepm
  *
  * Description:
  *   Perform IDLE state power management.
@@ -246,7 +245,7 @@ static int up_rtc_alarm(time_t tv_sec, time_t tv_nsec, bool exti)
  ****************************************************************************/
 
 #ifdef CONFIG_PM
-static void up_idlepm(void)
+static void stm32_idlepm(void)
 {
   static enum pm_state_e oldstate = PM_NORMAL;
   enum pm_state_e newstate;
@@ -363,7 +362,7 @@ static void up_idlepm(void)
              */
 
 #ifdef CONFIG_RTC_ALARM
-            up_exti_cancel();
+            stm32_exti_cancel();
             ret = up_rtc_cancelalarm();
             if (ret < 0)
               {
@@ -411,7 +410,7 @@ errout:
     }
 }
 #else
-#  define up_idlepm()
+#  define stm32_idlepm()
 #endif /* CONFIG_PM */
 
 /****************************************************************************
@@ -444,7 +443,7 @@ void up_idle(void)
   /* Perform IDLE mode power management */
 
   BEGIN_IDLE();
-  up_idlepm();
+  stm32_idlepm();
   END_IDLE();
 #endif
 }
diff --git a/configs/stm3210e-eval/src/up_lcd.c b/configs/stm3210e-eval/src/stm32_lcd.c
similarity index 99%
rename from configs/stm3210e-eval/src/up_lcd.c
rename to configs/stm3210e-eval/src/stm32_lcd.c
index a295b53fc7..4168f39a7c 100644
--- a/configs/stm3210e-eval/src/up_lcd.c
+++ b/configs/stm3210e-eval/src/stm32_lcd.c
@@ -1,6 +1,5 @@
 /**************************************************************************************
- * configs/stm3210e-eval/src/up_lcd.c
- * arch/arm/src/board/up_lcd.c
+ * configs/stm3210e-eval/src/stm32_lcd.c
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -76,7 +75,7 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 /**************************************************************************************
  * Pre-processor Definitions
diff --git a/configs/stm3210e-eval/src/up_leds.c b/configs/stm3210e-eval/src/stm32_leds.c
similarity index 98%
rename from configs/stm3210e-eval/src/up_leds.c
rename to configs/stm3210e-eval/src/stm32_leds.c
index 06c8ce8891..53479a135f 100644
--- a/configs/stm3210e-eval/src/up_leds.c
+++ b/configs/stm3210e-eval/src/stm32_leds.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/stm3210e_eval/src/up_leds.c
- * arch/arm/src/board/up_leds.c
+ * configs/stm3210e_eval/src/stm32_leds.c
  *
  *   Copyright (C) 2009-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +50,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 #include "stm32.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 /****************************************************************************
  * Definitions
@@ -380,11 +379,11 @@ void board_led_off(int led)
 }
 
 /****************************************************************************
- * Name: up_ledpminitialize
+ * Name: stm32_ledpminitialize
  ****************************************************************************/
 
 #ifdef CONFIG_PM
-void up_ledpminitialize(void)
+void stm32_ledpminitialize(void)
 {
   /* Register to receive power management callbacks */
 
diff --git a/configs/stm3210e-eval/src/up_lm75.c b/configs/stm3210e-eval/src/stm32_lm75.c
similarity index 97%
rename from configs/stm3210e-eval/src/up_lm75.c
rename to configs/stm3210e-eval/src/stm32_lm75.c
index d1bb288ffa..6a5ee0941d 100644
--- a/configs/stm3210e-eval/src/up_lm75.c
+++ b/configs/stm3210e-eval/src/stm32_lm75.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e-eval/src/up_lm75.c
- * arch/arm/src/board/up_lm75.c
+ * configs/stm3210e-eval/src/stm32_lm75.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -47,7 +46,7 @@
 
 #include "stm32.h"
 #include "stm32_i2c.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 #if defined(CONFIG_I2C) && defined(CONFIG_I2C_LM75) && defined(CONFIG_STM32_I2C1)
 
diff --git a/configs/stm3210e-eval/src/up_nsh.c b/configs/stm3210e-eval/src/stm32_nsh.c
similarity index 98%
rename from configs/stm3210e-eval/src/up_nsh.c
rename to configs/stm3210e-eval/src/stm32_nsh.c
index 3431676cbc..4242d1d0f2 100644
--- a/configs/stm3210e-eval/src/up_nsh.c
+++ b/configs/stm3210e-eval/src/stm32_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/stm3210e_eval/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/stm3210e_eval/src/stm32_nsh.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm3210e-eval/src/up_pm.c b/configs/stm3210e-eval/src/stm32_pm.c
similarity index 96%
rename from configs/stm3210e-eval/src/up_pm.c
rename to configs/stm3210e-eval/src/stm32_pm.c
index ab3e526c93..1da3078a9c 100644
--- a/configs/stm3210e-eval/src/up_pm.c
+++ b/configs/stm3210e-eval/src/stm32_pm.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/stm3210e-eval/src/up_pm.c
- * arch/arm/src/board/up_pm.c
+ * configs/stm3210e-eval/src/stm32_pm.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +44,7 @@
 
 #include "up_internal.h"
 #include "stm32_pm.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 #ifdef CONFIG_PM
 
@@ -96,12 +95,12 @@ void up_pminitialize(void)
 #if defined(CONFIG_ARCH_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS)
   /* Initialize the buttons to wake up the system from low power modes */
 
-  up_pmbuttons();
+  stm32_pmbuttons();
 #endif
 
   /* Initialize the LED PM */
 
-  up_ledpminitialize();
+  stm32_ledpminitialize();
 }
 
 #endif /* CONFIG_PM */
diff --git a/configs/stm3210e-eval/src/up_pmbuttons.c b/configs/stm3210e-eval/src/stm32_pmbuttons.c
similarity index 98%
rename from configs/stm3210e-eval/src/up_pmbuttons.c
rename to configs/stm3210e-eval/src/stm32_pmbuttons.c
index 4e35498f10..a042a54e62 100644
--- a/configs/stm3210e-eval/src/up_pmbuttons.c
+++ b/configs/stm3210e-eval/src/stm32_pmbuttons.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/stm3210e-eval/src/up_pmbuttons.c
- * arch/arm/src/board/up_pmbuttons.c
+ * configs/stm3210e-eval/src/stm32_pmbuttons.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +50,7 @@
 #include "nvic.h"
 #include "stm32_pwr.h"
 #include "stm32_pm.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 #if defined(CONFIG_PM) && defined(CONFIG_ARCH_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS)
 
@@ -286,7 +285,7 @@ static int button7_handler(int irq, FAR void *context)
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_pmbuttons
+ * Name: stm32_pmbuttons
  *
  * Description:
  *   Configure all the buttons of the STM3210e-eval board as EXTI,
@@ -294,7 +293,7 @@ static int button7_handler(int irq, FAR void *context)
  *
  ****************************************************************************/
 
-void up_pmbuttons(void)
+void stm32_pmbuttons(void)
 {
   /* Initialize the button GPIOs */
 
diff --git a/configs/stm3210e-eval/src/up_selectlcd.c b/configs/stm3210e-eval/src/stm32_selectlcd.c
similarity index 97%
rename from configs/stm3210e-eval/src/up_selectlcd.c
rename to configs/stm3210e-eval/src/stm32_selectlcd.c
index 3afc798354..003caef851 100644
--- a/configs/stm3210e-eval/src/up_selectlcd.c
+++ b/configs/stm3210e-eval/src/stm32_selectlcd.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e-eval/src/up_selectlcd.c
- * arch/arm/src/board/up_selectlcd.c
+ * configs/stm3210e-eval/src/stm32_selectlcd.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -47,7 +46,7 @@
 #include "up_arch.h"
 
 #include "stm32.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 #ifdef CONFIG_STM32_FSMC
 
diff --git a/configs/stm3210e-eval/src/up_selectnor.c b/configs/stm3210e-eval/src/stm32_selectnor.c
similarity index 97%
rename from configs/stm3210e-eval/src/up_selectnor.c
rename to configs/stm3210e-eval/src/stm32_selectnor.c
index 9ee1ad34fc..aa754a97a7 100644
--- a/configs/stm3210e-eval/src/up_selectnor.c
+++ b/configs/stm3210e-eval/src/stm32_selectnor.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e-eval/src/up_selectnor.c
- * arch/arm/src/board/up_selectnor.c
+ * configs/stm3210e-eval/src/stm32_selectnor.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -47,7 +46,7 @@
 #include "up_arch.h"
 
 #include "stm32.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 #ifdef CONFIG_STM32_FSMC
 
diff --git a/configs/stm3210e-eval/src/up_selectsram.c b/configs/stm3210e-eval/src/stm32_selectsram.c
similarity index 97%
rename from configs/stm3210e-eval/src/up_selectsram.c
rename to configs/stm3210e-eval/src/stm32_selectsram.c
index 3035110c88..b59e68e762 100644
--- a/configs/stm3210e-eval/src/up_selectsram.c
+++ b/configs/stm3210e-eval/src/stm32_selectsram.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e-eval/src/up_selectsram.c
- * arch/arm/src/board/up_selectsram.c
+ * configs/stm3210e-eval/src/stm32_selectsram.c
  *
  *   Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -47,7 +46,7 @@
 #include "up_arch.h"
 
 #include "stm32.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 #ifdef CONFIG_STM32_FSMC
 
diff --git a/configs/stm3210e-eval/src/up_spi.c b/configs/stm3210e-eval/src/stm32_spi.c
similarity index 98%
rename from configs/stm3210e-eval/src/up_spi.c
rename to configs/stm3210e-eval/src/stm32_spi.c
index b34494a091..17ce3523e2 100644
--- a/configs/stm3210e-eval/src/up_spi.c
+++ b/configs/stm3210e-eval/src/stm32_spi.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e_eval/src/up_spi.c
- * arch/arm/src/board/up_spi.c
+ * configs/stm3210e_eval/src/stm32_spi.c
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +49,7 @@
 #include "up_arch.h"
 #include "chip.h"
 #include "stm32.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)
 
diff --git a/configs/stm3210e-eval/src/up_usbdev.c b/configs/stm3210e-eval/src/stm32_usbdev.c
similarity index 97%
rename from configs/stm3210e-eval/src/up_usbdev.c
rename to configs/stm3210e-eval/src/stm32_usbdev.c
index fb472d18f2..16647dae62 100644
--- a/configs/stm3210e-eval/src/up_usbdev.c
+++ b/configs/stm3210e-eval/src/stm32_usbdev.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e-eval/src/up_usbdev.c
- * arch/arm/src/board/up_boot.c
+ * configs/stm3210e-eval/src/stm32_usbdev.c
  *
  *   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +49,7 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm3210e-internal.h"
+#include "stm3210e-eval.h"
 
 /************************************************************************************
  * Definitions
diff --git a/configs/stm3210e-eval/src/up_usbmsc.c b/configs/stm3210e-eval/src/stm32_usbmsc.c
similarity index 99%
rename from configs/stm3210e-eval/src/up_usbmsc.c
rename to configs/stm3210e-eval/src/stm32_usbmsc.c
index 3b37744d3c..d5c11ba4be 100644
--- a/configs/stm3210e-eval/src/up_usbmsc.c
+++ b/configs/stm3210e-eval/src/stm32_usbmsc.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm3210e-eval/src/up_usbmsc.c
+ * configs/stm3210e-eval/src/stm32_usbmsc.c
  *
  *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm3210e-eval/src/up_watchdog.c b/configs/stm3210e-eval/src/stm32_watchdog.c
similarity index 98%
rename from configs/stm3210e-eval/src/up_watchdog.c
rename to configs/stm3210e-eval/src/stm32_watchdog.c
index 0c09f75495..c44d74bddf 100644
--- a/configs/stm3210e-eval/src/up_watchdog.c
+++ b/configs/stm3210e-eval/src/stm32_watchdog.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3210e-eval/src/up_watchdog.c
- * arch/arm/src/board/up_watchdog.c
+ * configs/stm3210e-eval/src/stm32_watchdog.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>