diff --git a/configs/stm3240g-eval/src/Makefile b/configs/stm3240g-eval/src/Makefile
index 82cd6d37ed..47694793b7 100644
--- a/configs/stm3240g-eval/src/Makefile
+++ b/configs/stm3240g-eval/src/Makefile
@@ -35,75 +35,76 @@
 
 -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_spi.c
+CSRCS = stm32_boot.c stm32_spi.c
 
 ifeq ($(CONFIG_ARCH_LEDS),y)
-CSRCS		+= up_autoleds.c
+CSRCS += stm32_autoleds.c
 else
-CSRCS		+= up_userleds.c
+CSRCS += stm32_userleds.c
 endif
 
 ifeq ($(CONFIG_ARCH_BUTTONS),y)
-CSRCS		+=  up_buttons.c
+CSRCS +=  stm32_buttons.c
 endif
 
 ifeq ($(CONFIG_STM32_OTGFS),y)
-CSRCS		+= up_usb.c
+CSRCS += stm32_usb.c
 endif
 
 ifeq ($(CONFIG_STM32_FSMC),y)
-CSRCS		+= up_lcd.c up_selectlcd.c up_deselectlcd.c up_selectsram.c up_deselectsram.c up_extmem.c
+CSRCS += stm32_lcd.c stm32_selectlcd.c stm32_deselectlcd.c
+CSRCS += stm32_selectsram.c stm32_deselectsram.c stm32_extmem.c
 endif
 
 ifeq ($(CONFIG_ADC),y)
-CSRCS		+= up_adc.c
+CSRCS += stm32_adc.c
 endif
 
 ifeq ($(CONFIG_PWM),y)
-CSRCS		+= up_pwm.c
+CSRCS += stm32_pwm.c
 endif
 
 ifeq ($(CONFIG_CAN),y)
-CSRCS		+= up_can.c
+CSRCS += stm32_can.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS		+= up_nsh.c
+CSRCS += stm32_nsh.c
 endif
 
 ifeq ($(CONFIG_ARCH_FPU),y)
-CSRCS		+= up_ostest.c
+CSRCS += stm32_ostest.c
 endif
 
 ifeq ($(CONFIG_WATCHDOG),y)
-CSRCS		+= up_watchdog.c
+CSRCS += stm32_watchdog.c
 endif
 
 ifeq ($(CONFIG_INPUT_STMPE811),y)
-CSRCS		+= up_stmpe811.c
+CSRCS += stm32_stmpe811.c
 endif
 
 ifeq ($(CONFIG_QENCODER),y)
-CSRCS		+= up_qencoder.c
+CSRCS += stm32_qencoder.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/stm3240g-eval/src/stm3240g-internal.h b/configs/stm3240g-eval/src/stm3240g-eval.h
similarity index 98%
rename from configs/stm3240g-eval/src/stm3240g-internal.h
rename to configs/stm3240g-eval/src/stm3240g-eval.h
index 3d6e522f0d..845e139a6e 100644
--- a/configs/stm3240g-eval/src/stm3240g-internal.h
+++ b/configs/stm3240g-eval/src/stm3240g-eval.h
@@ -1,5 +1,5 @@
 /****************************************************************************************************
- * configs/stm3240g_eval/src/stm3240g_internal.h
+ * configs/stm3240g_eval/src/stm3240g_eval.h
  *
  *   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
  *
  ****************************************************************************************************/
 
-#ifndef __CONFIGS_STM3240G_EVAL_SRC_STM3240G_INTERNAL_H
-#define __CONFIGS_STM3240G_EVAL_SRC_STM3240G_INTERNAL_H
+#ifndef __CONFIGS_STM3240G_EVAL_SRC_STM3240G_EVAL_H
+#define __CONFIGS_STM3240G_EVAL_SRC_STM3240G_EVAL_H
 
 /****************************************************************************************************
  * Included Files
@@ -400,4 +400,4 @@ int nsh_archinitialize(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __CONFIGS_STM3240G_EVAL_SRC_STM3240G_INTERNAL_H */
+#endif /* __CONFIGS_STM3240G_EVAL_SRC_STM3240G_EVAL_H */
diff --git a/configs/stm3240g-eval/src/up_adc.c b/configs/stm3240g-eval/src/stm32_adc.c
similarity index 97%
rename from configs/stm3240g-eval/src/up_adc.c
rename to configs/stm3240g-eval/src/stm32_adc.c
index e42651761b..9fba540237 100644
--- a/configs/stm3240g-eval/src/up_adc.c
+++ b/configs/stm3240g-eval/src/stm32_adc.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3240g-eval/src/up_adc.c
- * arch/arm/src/board/up_adc.c
+ * configs/stm3240g-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 "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 #ifdef CONFIG_ADC
 
@@ -165,4 +164,4 @@ int adc_devinit(void)
 }
 
 #endif /* CONFIG_STM32_ADC1 || CONFIG_STM32_ADC2 || CONFIG_STM32_ADC3 */
-#endif /* CONFIG_ADC */
\ No newline at end of file
+#endif /* CONFIG_ADC */
diff --git a/configs/stm3240g-eval/src/up_autoleds.c b/configs/stm3240g-eval/src/stm32_autoleds.c
similarity index 98%
rename from configs/stm3240g-eval/src/up_autoleds.c
rename to configs/stm3240g-eval/src/stm32_autoleds.c
index 09e527cc6b..5f55e7413d 100644
--- a/configs/stm3240g-eval/src/up_autoleds.c
+++ b/configs/stm3240g-eval/src/stm32_autoleds.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/stm3240g_eval/src/up_autoleds.c
- * arch/arm/src/board/up_autoleds.c
+ * configs/stm3240g_eval/src/stm32_autoleds.c
  *
  *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +49,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 #include "stm32.h"
-#include "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 #ifdef CONFIG_ARCH_LEDS
 
diff --git a/configs/stm3240g-eval/src/up_boot.c b/configs/stm3240g-eval/src/stm32_boot.c
similarity index 98%
rename from configs/stm3240g-eval/src/up_boot.c
rename to configs/stm3240g-eval/src/stm32_boot.c
index c1ebe3ea7d..df899ba9dd 100644
--- a/configs/stm3240g-eval/src/up_boot.c
+++ b/configs/stm3240g-eval/src/stm32_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/stm3240g-eval/src/up_boot.c
+ * configs/stm3240g-eval/src/stm32_boot.c
  *
  *   Copyright (C) 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -41,7 +41,7 @@
 
 #include <debug.h>
 
-#include "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 /************************************************************************************
  * Pre-processor Definitions
@@ -250,7 +250,7 @@ void stm32_boardinitialize(void)
  *   If CONFIG_BOARD_INITIALIZE is selected, then an additional
  *   initialization call will be performed in the boot-up sequence to a
  *   function called board_initialize().  board_initialize() will be
- *   called immediately after up_intiialize() is called and just before the
+ *   called immediately after up_initialize() is called and just before the
  *   initial application is started.  This additional initialization phase
  *   may be used, for example, to initialize board-specific device drivers.
  *
diff --git a/configs/stm3240g-eval/src/up_buttons.c b/configs/stm3240g-eval/src/stm32_buttons.c
similarity index 98%
rename from configs/stm3240g-eval/src/up_buttons.c
rename to configs/stm3240g-eval/src/stm32_buttons.c
index 0607e6e215..09d37c0bb6 100644
--- a/configs/stm3240g-eval/src/up_buttons.c
+++ b/configs/stm3240g-eval/src/stm32_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm3240g-eval/src/board_buttons.c
+ * configs/stm3240g-eval/src/stm32_buttons.c
  *
  *   Copyright (C) 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 "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 #ifdef CONFIG_ARCH_BUTTONS
 
diff --git a/configs/stm3240g-eval/src/up_can.c b/configs/stm3240g-eval/src/stm32_can.c
similarity index 97%
rename from configs/stm3240g-eval/src/up_can.c
rename to configs/stm3240g-eval/src/stm32_can.c
index 6fcbbb2113..f89acdb760 100644
--- a/configs/stm3240g-eval/src/up_can.c
+++ b/configs/stm3240g-eval/src/stm32_can.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3240g-eval/src/up_can.c
- * arch/arm/src/board/up_can.c
+ * configs/stm3240g-eval/src/stm32_can.c
  *
  *   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +50,7 @@
 
 #include "stm32.h"
 #include "stm32_can.h"
-#include "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 #if defined(CONFIG_CAN) && (defined(CONFIG_STM32_CAN1) || defined(CONFIG_STM32_CAN2))
 
diff --git a/configs/stm3240g-eval/src/up_deselectlcd.c b/configs/stm3240g-eval/src/stm32_deselectlcd.c
similarity index 96%
rename from configs/stm3240g-eval/src/up_deselectlcd.c
rename to configs/stm3240g-eval/src/stm32_deselectlcd.c
index 8597c55ac4..76a6108ae1 100644
--- a/configs/stm3240g-eval/src/up_deselectlcd.c
+++ b/configs/stm3240g-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) 2012 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -45,7 +44,7 @@
 
 #include "up_arch.h"
 #include "stm32_fsmc.h"
-#include "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 #ifdef CONFIG_STM32_FSMC
 
diff --git a/configs/stm3240g-eval/src/up_deselectsram.c b/configs/stm3240g-eval/src/stm32_deselectsram.c
similarity index 96%
rename from configs/stm3240g-eval/src/up_deselectsram.c
rename to configs/stm3240g-eval/src/stm32_deselectsram.c
index e4ed3bb454..bf38b924c1 100644
--- a/configs/stm3240g-eval/src/up_deselectsram.c
+++ b/configs/stm3240g-eval/src/stm32_deselectsram.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3240g-eval/src/up_deselectsram.c
- * arch/arm/src/board/up_deselectsram.c
+ * configs/stm3240g-eval/src/stm32_deselectsram.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -44,7 +43,7 @@
 
 #include "up_arch.h"
 #include "stm32_fsmc.h"
-#include "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 #ifdef CONFIG_STM32_FSMC
 
diff --git a/configs/stm3240g-eval/src/up_extmem.c b/configs/stm3240g-eval/src/stm32_extmem.c
similarity index 98%
rename from configs/stm3240g-eval/src/up_extmem.c
rename to configs/stm3240g-eval/src/stm32_extmem.c
index e6ccfade29..42b7a1e156 100644
--- a/configs/stm3240g-eval/src/up_extmem.c
+++ b/configs/stm3240g-eval/src/stm32_extmem.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3240g-eval/src/up_extmem.c
- * arch/arm/src/board/up_extmem.c
+ * configs/stm3240g-eval/src/stm32_extmem.c
  *
  *   Copyright (C) 2012 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 "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 /************************************************************************************
  * Pre-processor Definitions
diff --git a/configs/stm3240g-eval/src/up_lcd.c b/configs/stm3240g-eval/src/stm32_lcd.c
similarity index 99%
rename from configs/stm3240g-eval/src/up_lcd.c
rename to configs/stm3240g-eval/src/stm32_lcd.c
index af6d557458..350fc33b13 100644
--- a/configs/stm3240g-eval/src/up_lcd.c
+++ b/configs/stm3240g-eval/src/stm32_lcd.c
@@ -1,6 +1,5 @@
 /**************************************************************************************
- * configs/stm3240g-eval/src/up_lcd.c
- * arch/arm/src/board/up_lcd.c
+ * configs/stm3240g-eval/src/stm32_lcd.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -61,7 +60,7 @@
 
 #include "up_arch.h"
 #include "stm32.h"
-#include "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 #if !defined(CONFIG_STM3240G_ILI9320_DISABLE) || !defined(CONFIG_STM3240G_ILI9325_DISABLE)
 
diff --git a/configs/stm3240g-eval/src/up_nsh.c b/configs/stm3240g-eval/src/stm32_nsh.c
similarity index 98%
rename from configs/stm3240g-eval/src/up_nsh.c
rename to configs/stm3240g-eval/src/stm32_nsh.c
index 982e5fbabb..963f03a213 100644
--- a/configs/stm3240g-eval/src/up_nsh.c
+++ b/configs/stm3240g-eval/src/stm32_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/stm3240g_eval/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/stm3240g_eval/src/stm32_nsh.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -60,7 +59,7 @@
 #endif
 
 #include "stm32.h"
-#include "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/configs/stm3240g-eval/src/up_ostest.c b/configs/stm3240g-eval/src/stm32_ostest.c
similarity index 97%
rename from configs/stm3240g-eval/src/up_ostest.c
rename to configs/stm3240g-eval/src/stm32_ostest.c
index b84f7a40e2..2df1201437 100644
--- a/configs/stm3240g-eval/src/up_ostest.c
+++ b/configs/stm3240g-eval/src/stm32_ostest.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3240g-eval/src/up_ostest.c
- * arch/arm/src/board/up_ostest.c
+ * configs/stm3240g-eval/src/stm32_ostest.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +49,7 @@
 
 #include "up_arch.h"
 #include "up_internal.h"
-#include "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 /************************************************************************************
  * Definitions
diff --git a/configs/stm3240g-eval/src/up_pwm.c b/configs/stm3240g-eval/src/stm32_pwm.c
similarity index 97%
rename from configs/stm3240g-eval/src/up_pwm.c
rename to configs/stm3240g-eval/src/stm32_pwm.c
index 7cc1d39d5e..77696e2c59 100644
--- a/configs/stm3240g-eval/src/up_pwm.c
+++ b/configs/stm3240g-eval/src/stm32_pwm.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3240g-eval/src/up_pwm.c
- * arch/arm/src/board/up_pwm.c
+ * configs/stm3240g-eval/src/stm32_pwm.c
  *
  *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -49,7 +48,7 @@
 #include "chip.h"
 #include "up_arch.h"
 #include "stm32_pwm.h"
-#include "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 /************************************************************************************
  * Definitions
diff --git a/configs/stm3240g-eval/src/up_selectlcd.c b/configs/stm3240g-eval/src/stm32_selectlcd.c
similarity index 98%
rename from configs/stm3240g-eval/src/up_selectlcd.c
rename to configs/stm3240g-eval/src/stm32_selectlcd.c
index ff6fd73844..0587cdd152 100644
--- a/configs/stm3240g-eval/src/up_selectlcd.c
+++ b/configs/stm3240g-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) 2012 Gregory Nutt. All rights reserved.
  *   Authors: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +47,7 @@
 #include "up_arch.h"
 
 #include "stm32.h"
-#include "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 #ifdef CONFIG_STM32_FSMC
 
diff --git a/configs/stm3240g-eval/src/up_selectsram.c b/configs/stm3240g-eval/src/stm32_selectsram.c
similarity index 98%
rename from configs/stm3240g-eval/src/up_selectsram.c
rename to configs/stm3240g-eval/src/stm32_selectsram.c
index 479f63d7e4..90f10154e1 100644
--- a/configs/stm3240g-eval/src/up_selectsram.c
+++ b/configs/stm3240g-eval/src/stm32_selectsram.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3240g-eval/src/up_selectsram.c
- * arch/arm/src/board/up_selectsram.c
+ * configs/stm3240g-eval/src/stm32_selectsram.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -47,7 +46,7 @@
 #include "up_arch.h"
 
 #include "stm32.h"
-#include "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 #ifdef CONFIG_STM32_FSMC
 
diff --git a/configs/stm3240g-eval/src/up_spi.c b/configs/stm3240g-eval/src/stm32_spi.c
similarity index 98%
rename from configs/stm3240g-eval/src/up_spi.c
rename to configs/stm3240g-eval/src/stm32_spi.c
index 2278506262..1de99af07a 100644
--- a/configs/stm3240g-eval/src/up_spi.c
+++ b/configs/stm3240g-eval/src/stm32_spi.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3240g_eval/src/up_spi.c
- * arch/arm/src/board/up_spi.c
+ * configs/stm3240g_eval/src/stm32_spi.c
  *
  *   Copyright (C) 2011 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 "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)
 
diff --git a/configs/stm3240g-eval/src/up_stmpe811.c b/configs/stm3240g-eval/src/stm32_stmpe811.c
similarity index 99%
rename from configs/stm3240g-eval/src/up_stmpe811.c
rename to configs/stm3240g-eval/src/stm32_stmpe811.c
index 8e4aed3077..6ef8eb2690 100644
--- a/configs/stm3240g-eval/src/up_stmpe811.c
+++ b/configs/stm3240g-eval/src/stm32_stmpe811.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3240g-eval/src/up_touchscreen.c
- * arch/arm/src/board/up_touchscreen.c
+ * configs/stm3240g-eval/src/stm32_stmpe811.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -52,7 +51,7 @@
 #include <arch/irq.h>
 
 #include "stm32.h"
-#include "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 /****************************************************************************
  * Pre-Processor Definitions
diff --git a/configs/stm3240g-eval/src/up_usb.c b/configs/stm3240g-eval/src/stm32_usb.c
similarity index 98%
rename from configs/stm3240g-eval/src/up_usb.c
rename to configs/stm3240g-eval/src/stm32_usb.c
index b5e988390a..8b5e2d7b98 100644
--- a/configs/stm3240g-eval/src/up_usb.c
+++ b/configs/stm3240g-eval/src/stm32_usb.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3240g-eval/src/up_usbdev.c
- * arch/arm/src/board/up_boot.c
+ * configs/stm3240g-eval/src/stm32_usbdev.c
  *
  *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -54,7 +53,7 @@
 #include "up_arch.h"
 #include "stm32.h"
 #include "stm32_otgfs.h"
-#include "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 #ifdef CONFIG_STM32_OTGFS
 
diff --git a/configs/stm3240g-eval/src/up_userleds.c b/configs/stm3240g-eval/src/stm32_userleds.c
similarity index 97%
rename from configs/stm3240g-eval/src/up_userleds.c
rename to configs/stm3240g-eval/src/stm32_userleds.c
index ffc7ef550a..eb147f3178 100644
--- a/configs/stm3240g-eval/src/up_userleds.c
+++ b/configs/stm3240g-eval/src/stm32_userleds.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/stm3240g_eval/src/up_userleds.c
- * arch/arm/src/board/up_userleds.c
+ * configs/stm3240g_eval/src/stm32_userleds.c
  *
  *   Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +49,7 @@
 #include "up_arch.h"
 #include "up_internal.h"
 #include "stm32.h"
-#include "stm3240g-internal.h"
+#include "stm3240g-eval.h"
 
 #ifndef CONFIG_ARCH_LEDS
 
diff --git a/configs/stm3240g-eval/src/up_watchdog.c b/configs/stm3240g-eval/src/stm32_watchdog.c
similarity index 98%
rename from configs/stm3240g-eval/src/up_watchdog.c
rename to configs/stm3240g-eval/src/stm32_watchdog.c
index db4a54a9fe..ef93c86c1a 100644
--- a/configs/stm3240g-eval/src/up_watchdog.c
+++ b/configs/stm3240g-eval/src/stm32_watchdog.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm3240g-eval/src/up_watchdog.c
- * arch/arm/src/board/up_watchdog.c
+ * configs/stm3240g-eval/src/stm32_watchdog.c
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>