diff --git a/configs/stm32_tiny/src/Makefile b/configs/stm32_tiny/src/Makefile
index 56c466757dd..6fb6bcc26e4 100644
--- a/configs/stm32_tiny/src/Makefile
+++ b/configs/stm32_tiny/src/Makefile
@@ -36,41 +36,41 @@
 
 -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_spi.c up_usbdev.c
+CSRCS = stm32_boot.c stm32_leds.c stm32_spi.c stm32_usbdev.c
 
 ifeq ($(CONFIG_PWM),y)
-CSRCS		+= up_pwm.c
+CSRCS += stm32_pwm.c
 endif
 
 ifeq ($(CONFIG_WL_NRF24L01),y)
-CSRCS		+= up_wireless.c
+CSRCS += stm32_wireless.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS		+= up_nsh.c
+CSRCS += stm32_nsh.c
 endif
 
 ifeq ($(CONFIG_WATCHDOG),y)
-CSRCS		+= up_watchdog.c
+CSRCS += stm32_watchdog.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/stm32_tiny/src/up_boot.c b/configs/stm32_tiny/src/stm32_boot.c
similarity index 99%
rename from configs/stm32_tiny/src/up_boot.c
rename to configs/stm32_tiny/src/stm32_boot.c
index bb05dae15d7..e030ef8f3bc 100644
--- a/configs/stm32_tiny/src/up_boot.c
+++ b/configs/stm32_tiny/src/stm32_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/stm32_tiny/src/up_boot.c
+ * configs/stm32_tiny/src/stm32_boot.c
  *
  *   Copyright (C) 2009, 2011, 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32_tiny/src/up_leds.c b/configs/stm32_tiny/src/stm32_leds.c
similarity index 99%
rename from configs/stm32_tiny/src/up_leds.c
rename to configs/stm32_tiny/src/stm32_leds.c
index 4887f66f843..4439a701334 100644
--- a/configs/stm32_tiny/src/up_leds.c
+++ b/configs/stm32_tiny/src/stm32_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm32_tiny/src/up_leds.c
+ * configs/stm32_tiny/src/stm32_leds.c
  *
  *   Copyright (C) 2009, 2011, 2013, 2015 Gregory Nutt. All rights reserved.
  *   Author: Laurent Latil <laurent@latil.nom.fr>
diff --git a/configs/stm32_tiny/src/up_nsh.c b/configs/stm32_tiny/src/stm32_nsh.c
similarity index 96%
rename from configs/stm32_tiny/src/up_nsh.c
rename to configs/stm32_tiny/src/stm32_nsh.c
index 1ceb3b56c86..1e22dfd8abc 100644
--- a/configs/stm32_tiny/src/up_nsh.c
+++ b/configs/stm32_tiny/src/stm32_nsh.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/stm32_tiny/src/up_nsh.c
+ * config/stm32_tiny/src/stm32_nsh.c
  *
  *   Copyright (C) 2009, 2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +48,7 @@
 #include "stm32_tiny-internal.h"
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /****************************************************************************
@@ -67,7 +67,7 @@ int nsh_archinitialize(void)
 {
 #if defined(CONFIG_WL_NRF24L01)
   syslog(LOG_INFO, "Register the nRF24L01 module");
-  up_wlinitialize();
+  stm32_wlinitialize();
 #endif
 
   return OK;
diff --git a/configs/stm32_tiny/src/up_pwm.c b/configs/stm32_tiny/src/stm32_pwm.c
similarity index 98%
rename from configs/stm32_tiny/src/up_pwm.c
rename to configs/stm32_tiny/src/stm32_pwm.c
index 70dfdc11f58..a742d29f869 100644
--- a/configs/stm32_tiny/src/up_pwm.c
+++ b/configs/stm32_tiny/src/stm32_pwm.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/stm32_tiny/src/up_pwm.c
+ * configs/stm32_tiny/src/stm32_pwm.c
  *
  *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -51,7 +51,7 @@
 #include "stm32_tiny-internal.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 /* Configuration *******************************************************************/
 /* PWM
diff --git a/configs/stm32_tiny/src/up_spi.c b/configs/stm32_tiny/src/stm32_spi.c
similarity index 98%
rename from configs/stm32_tiny/src/up_spi.c
rename to configs/stm32_tiny/src/stm32_spi.c
index e79361857b4..8473002588c 100644
--- a/configs/stm32_tiny/src/up_spi.c
+++ b/configs/stm32_tiny/src/stm32_spi.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/stm32_tiny/src/up_spi.c
+ * configs/stm32_tiny/src/stm32_spi.c
  *
  *   Copyright (C) 2009, 2011-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -55,7 +55,7 @@
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* Enables debug output from this file (needs CONFIG_DEBUG too) */
diff --git a/configs/stm32_tiny/src/stm32_tiny-internal.h b/configs/stm32_tiny/src/stm32_tiny-internal.h
index 487857df5c9..17471d660aa 100644
--- a/configs/stm32_tiny/src/stm32_tiny-internal.h
+++ b/configs/stm32_tiny/src/stm32_tiny-internal.h
@@ -45,7 +45,7 @@
 #include <stdint.h>
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* How many SPI modules does this chip support? The LM3S6918 supports 2 SPI
@@ -134,14 +134,14 @@ extern void stm32_spiinitialize(void);
 extern void stm32_usbinitialize(void);
 
 /************************************************************************************
- * Name: up_wlinitialize
+ * Name: stm32_wlinitialize
  *
  * Description:
  *   Called to configure wireless module (nRF24L01).
  *
  ************************************************************************************/
 
-extern void up_wlinitialize(void);
+extern void stm32_wlinitialize(void);
 
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_HYMINI_STM32V_INTERNAL_H */
diff --git a/configs/stm32_tiny/src/up_usbdev.c b/configs/stm32_tiny/src/stm32_usbdev.c
similarity index 98%
rename from configs/stm32_tiny/src/up_usbdev.c
rename to configs/stm32_tiny/src/stm32_usbdev.c
index 72a2e41e198..39999441cd3 100644
--- a/configs/stm32_tiny/src/up_usbdev.c
+++ b/configs/stm32_tiny/src/stm32_usbdev.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/stm32_tiny/src/up_usbdev.c
+ * configs/stm32_tiny/src/stm32_usbdev.c
  *
  *   Copyright (C) 2009-2011, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -53,7 +53,7 @@
 #include "stm32_tiny-internal.h"
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
diff --git a/configs/stm32_tiny/src/up_watchdog.c b/configs/stm32_tiny/src/stm32_watchdog.c
similarity index 98%
rename from configs/stm32_tiny/src/up_watchdog.c
rename to configs/stm32_tiny/src/stm32_watchdog.c
index 874f8a8463b..a722dd737fc 100644
--- a/configs/stm32_tiny/src/up_watchdog.c
+++ b/configs/stm32_tiny/src/stm32_watchdog.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/stm_tiny/src/up_watchdog.c
+ * configs/stm_tiny/src/stm32_watchdog.c
  *
  *   Copyright (C) 2012-2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #ifdef CONFIG_WATCHDOG
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 /* Configuration *******************************************************************/
 /* Wathdog hardware should be enabled */
diff --git a/configs/stm32_tiny/src/up_wireless.c b/configs/stm32_tiny/src/stm32_wireless.c
similarity index 98%
rename from configs/stm32_tiny/src/up_wireless.c
rename to configs/stm32_tiny/src/stm32_wireless.c
index 59ec003473b..acb393712a0 100644
--- a/configs/stm32_tiny/src/up_wireless.c
+++ b/configs/stm32_tiny/src/stm32_wireless.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/stm32_tiny/src/up_wireless.c
+ * configs/stm32_tiny/src/stm32_wireless.c
  *
  *   Copyright (C) 2009, 2013 Gregory Nutt. All rights reserved.
  *   Author: Laurent Latil <laurent@latil.nom.fr>
@@ -95,7 +95,7 @@ static void stm32tiny_wl_chip_enable(bool enable)
  * Public Functions
  ************************************************************************************/
 
-void up_wlinitialize(void)
+void stm32_wlinitialize(void)
 {
 #  ifndef CONFIG_STM32_SPI2
 #   error "STM32_SPI2 is required to support nRF24L01 module on this board"