diff --git a/configs/stm32f3discovery/src/Makefile b/configs/stm32f3discovery/src/Makefile
index 137ee536b87..f9069ec67f8 100644
--- a/configs/stm32f3discovery/src/Makefile
+++ b/configs/stm32f3discovery/src/Makefile
@@ -40,40 +40,40 @@ CFLAGS += -I$(TOPDIR)/sched
 ASRCS =
 AOBJS = $(ASRCS:.S=$(OBJEXT))
 
-CSRCS = up_boot.c up_spi.c
+CSRCS = stm32_boot.c stm32_spi.c
 
 ifeq ($(CONFIG_HAVE_CXX),y)
-CSRCS += up_cxxinitialize.c
+CSRCS += stm32_cxxinitialize.c
 endif
 
 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_USB),y)
-CSRCS += up_usb.c
+CSRCS += stm32_usb.c
 endif
 
 ifeq ($(CONFIG_PWM),y)
-CSRCS += up_pwm.c
+CSRCS += stm32_pwm.c
 endif
 
 ifeq ($(CONFIG_QENCODER),y)
-CSRCS += up_qencoder.c
+CSRCS += stm32_qencoder.c
 endif
 
 ifeq ($(CONFIG_WATCHDOG),y)
-CSRCS += up_watchdog.c
+CSRCS += stm32_watchdog.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS += up_nsh.c
+CSRCS += stm32_nsh.c
 endif
 
 COBJS = $(CSRCS:.c=$(OBJEXT))
diff --git a/configs/stm32f3discovery/src/up_autoleds.c b/configs/stm32f3discovery/src/stm32_autoleds.c
similarity index 98%
rename from configs/stm32f3discovery/src/up_autoleds.c
rename to configs/stm32f3discovery/src/stm32_autoleds.c
index e1fc1fa3e2c..ee45636aef1 100644
--- a/configs/stm32f3discovery/src/up_autoleds.c
+++ b/configs/stm32f3discovery/src/stm32_autoleds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm32f3discovery/src/up_autoleds.c
+ * configs/stm32f3discovery/src/stm32_autoleds.c
  *
  *   Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f3discovery/src/up_boot.c b/configs/stm32f3discovery/src/stm32_boot.c
similarity index 98%
rename from configs/stm32f3discovery/src/up_boot.c
rename to configs/stm32f3discovery/src/stm32_boot.c
index d5508038f21..0231f25cec0 100644
--- a/configs/stm32f3discovery/src/up_boot.c
+++ b/configs/stm32f3discovery/src/stm32_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/stm32f3discovery/src/up_boot.c
+ * configs/stm32f3discovery/src/stm32_boot.c
  *
  *   Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f3discovery/src/up_buttons.c b/configs/stm32f3discovery/src/stm32_buttons.c
similarity index 99%
rename from configs/stm32f3discovery/src/up_buttons.c
rename to configs/stm32f3discovery/src/stm32_buttons.c
index 854c3a17e7b..bc62f3f753c 100644
--- a/configs/stm32f3discovery/src/up_buttons.c
+++ b/configs/stm32f3discovery/src/stm32_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm32f3discovery/src/board_buttons.c
+ * configs/stm32f3discovery/src/stm32_buttons.c
  *
  *   Copyright (C) 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f3discovery/src/up_cxxinitialize.c b/configs/stm32f3discovery/src/stm32_cxxinitialize.c
similarity index 98%
rename from configs/stm32f3discovery/src/up_cxxinitialize.c
rename to configs/stm32f3discovery/src/stm32_cxxinitialize.c
index 43e028e8cbe..c6dbd6e7c30 100644
--- a/configs/stm32f3discovery/src/up_cxxinitialize.c
+++ b/configs/stm32f3discovery/src/stm32_cxxinitialize.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm32f3discovery/src/up_cxxinitialize.c
- * arch/arm/src/board/up_cxxinitialize.c
+ * configs/stm32f3discovery/src/stm32_cxxinitialize.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f3discovery/src/up_nsh.c b/configs/stm32f3discovery/src/stm32_nsh.c
similarity index 98%
rename from configs/stm32f3discovery/src/up_nsh.c
rename to configs/stm32f3discovery/src/stm32_nsh.c
index 113a1f70437..e57934c4419 100644
--- a/configs/stm32f3discovery/src/up_nsh.c
+++ b/configs/stm32f3discovery/src/stm32_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/stm32f3discovery/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/stm32f3discovery/src/stm32_nsh.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f3discovery/src/up_pwm.c b/configs/stm32f3discovery/src/stm32_pwm.c
similarity index 98%
rename from configs/stm32f3discovery/src/up_pwm.c
rename to configs/stm32f3discovery/src/stm32_pwm.c
index d2f986eaec1..8b7eaacdfe1 100644
--- a/configs/stm32f3discovery/src/up_pwm.c
+++ b/configs/stm32f3discovery/src/stm32_pwm.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm32f3discovery/src/up_pwm.c
- * arch/arm/src/board/up_pwm.c
+ * configs/stm32f3discovery/src/stm32_pwm.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f3discovery/src/up_qencoder.c b/configs/stm32f3discovery/src/stm32_qencoder.c
similarity index 98%
rename from configs/stm32f3discovery/src/up_qencoder.c
rename to configs/stm32f3discovery/src/stm32_qencoder.c
index 14a0ad7df2a..c49ca025ef3 100644
--- a/configs/stm32f3discovery/src/up_qencoder.c
+++ b/configs/stm32f3discovery/src/stm32_qencoder.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm32f3discovery/src/up_qencoder.c
- * arch/arm/src/board/up_qencoder.c
+ * configs/stm32f3discovery/src/stm32_qencoder.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f3discovery/src/up_spi.c b/configs/stm32f3discovery/src/stm32_spi.c
similarity index 99%
rename from configs/stm32f3discovery/src/up_spi.c
rename to configs/stm32f3discovery/src/stm32_spi.c
index 408b0df5d5f..faa3fb34cf7 100644
--- a/configs/stm32f3discovery/src/up_spi.c
+++ b/configs/stm32f3discovery/src/stm32_spi.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm32f3discovery/src/up_spi.c
- * arch/arm/src/board/up_spi.c
+ * configs/stm32f3discovery/src/stm32_spi.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f3discovery/src/up_usb.c b/configs/stm32f3discovery/src/stm32_usb.c
similarity index 98%
rename from configs/stm32f3discovery/src/up_usb.c
rename to configs/stm32f3discovery/src/stm32_usb.c
index 79b41bf3a95..7ac236fc6e6 100644
--- a/configs/stm32f3discovery/src/up_usb.c
+++ b/configs/stm32f3discovery/src/stm32_usb.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm32f3discovery/src/up_usbdev.c
- * arch/arm/src/board/up_boot.c
+ * configs/stm32f3discovery/src/stm32_usb.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f3discovery/src/up_userleds.c b/configs/stm32f3discovery/src/stm32_userleds.c
similarity index 98%
rename from configs/stm32f3discovery/src/up_userleds.c
rename to configs/stm32f3discovery/src/stm32_userleds.c
index 8d8f3326ce1..e75193855ad 100644
--- a/configs/stm32f3discovery/src/up_userleds.c
+++ b/configs/stm32f3discovery/src/stm32_userleds.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * configs/stm32f3discovery/src/up_leds.c
- * arch/arm/src/board/up_leds.c
+ * configs/stm32f3discovery/src/stm32_userleds.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f3discovery/src/up_watchdog.c b/configs/stm32f3discovery/src/stm32_watchdog.c
similarity index 98%
rename from configs/stm32f3discovery/src/up_watchdog.c
rename to configs/stm32f3discovery/src/stm32_watchdog.c
index 750757da492..ff8072f31bc 100644
--- a/configs/stm32f3discovery/src/up_watchdog.c
+++ b/configs/stm32f3discovery/src/stm32_watchdog.c
@@ -1,6 +1,5 @@
 /************************************************************************************
- * configs/stm32f3discovery/src/up_watchdog.c
- * arch/arm/src/board/up_watchdog.c
+ * configs/stm32f3discovery/src/stm32_watchdog.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>