diff --git a/configs/olimex-strp711/src/Makefile b/configs/olimex-strp711/src/Makefile
index 97e42a1347..74f13a0a4b 100644
--- a/configs/olimex-strp711/src/Makefile
+++ b/configs/olimex-strp711/src/Makefile
@@ -35,31 +35,31 @@
 
 -include $(TOPDIR)/Make.defs
 
-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)/arm}" \
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/sched}"
+  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/arm}" \
+            -I "${shell cygpath -w $(ARCH_SRCDIR)/sched}"
 else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm -I$(TOPDIR)/sched
+  CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/arm -I$(TOPDIR)/sched
 endif
 
-ASRCS		=
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-CSRCS		= up_spi.c up_leds.c up_buttons.c
+ASRCS =
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+CSRCS = str71_spi.c str71_leds.c str71_buttons.c
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
-CSRCS		+= up_nsh.c
+CSRCS += str71_nsh.c
 endif
 ifeq ($(CONFIG_ENC28J60),y)
-CSRCS		+= up_enc28j60.c
+CSRCS += str71_enc28j60.c
 endif
-COBJS		= $(CSRCS:.c=$(OBJEXT))
+COBJS = $(CSRCS:.c=$(OBJEXT))
 
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
 
-CFLAGS		+= -I $(TOPDIR)/arch/$(CONFIG_ARCH)/src
+CFLAGS += -I $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 
 all: libboard$(LIBEXT)
 
diff --git a/configs/olimex-strp711/src/up_buttons.c b/configs/olimex-strp711/src/str71_buttons.c
similarity index 99%
rename from configs/olimex-strp711/src/up_buttons.c
rename to configs/olimex-strp711/src/str71_buttons.c
index 3b15c0b1f2..98537be388 100644
--- a/configs/olimex-strp711/src/up_buttons.c
+++ b/configs/olimex-strp711/src/str71_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/olimex-strp711/src/up_leds.c
+ * configs/olimex-strp711/src/str71_buttons.c
  *
  *   Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/olimex-strp711/src/up_enc28j60.c b/configs/olimex-strp711/src/str71_enc28j60.c
similarity index 99%
rename from configs/olimex-strp711/src/up_enc28j60.c
rename to configs/olimex-strp711/src/str71_enc28j60.c
index 9b1860ea81..0e4e8f972c 100644
--- a/configs/olimex-strp711/src/up_enc28j60.c
+++ b/configs/olimex-strp711/src/str71_enc28j60.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/olimex-strp711/src/up_enc28j60.c
+ * configs/olimex-strp711/src/str71_enc28j60.c
  *
  *   Copyright (C) 2010, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -98,7 +98,7 @@
 #ifdef CONFIG_ENC28J60
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/
diff --git a/configs/olimex-strp711/src/up_leds.c b/configs/olimex-strp711/src/str71_leds.c
similarity index 99%
rename from configs/olimex-strp711/src/up_leds.c
rename to configs/olimex-strp711/src/str71_leds.c
index 4cdb0297dc..79b1a4fc7a 100644
--- a/configs/olimex-strp711/src/up_leds.c
+++ b/configs/olimex-strp711/src/str71_leds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/olimex-strp711/src/up_leds.c
+ * configs/olimex-strp711/src/str71_leds.c
  *
  *   Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/olimex-strp711/src/up_nsh.c b/configs/olimex-strp711/src/str71_nsh.c
similarity index 98%
rename from configs/olimex-strp711/src/up_nsh.c
rename to configs/olimex-strp711/src/str71_nsh.c
index 6f7cc7a19b..993c7a2065 100644
--- a/configs/olimex-strp711/src/up_nsh.c
+++ b/configs/olimex-strp711/src/str71_nsh.c
@@ -1,6 +1,5 @@
 /****************************************************************************
- * config/olimex-strp711/src/up_nsh.c
- * arch/arm/src/board/up_nsh.c
+ * config/olimex-strp711/src/str71_nsh.c
  *
  *   Copyright (C) 2009-2010 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -48,7 +47,7 @@
 #include <nuttx/mmcsd.h>
 
 /****************************************************************************
- * Pre-Processor Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/
diff --git a/configs/olimex-strp711/src/up_spi.c b/configs/olimex-strp711/src/str71_spi.c
similarity index 99%
rename from configs/olimex-strp711/src/up_spi.c
rename to configs/olimex-strp711/src/str71_spi.c
index e11ecfa534..9b4b3f08ef 100644
--- a/configs/olimex-strp711/src/up_spi.c
+++ b/configs/olimex-strp711/src/str71_spi.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * config/olimex-strp711/src/up_spi.c
+ * config/olimex-strp711/src/str71_spi.c
  *
  *   Copyright (C) 2008-2010,2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -58,7 +58,7 @@
 #if defined(CONFIG_STR71X_BSPI0) || defined(CONFIG_STR71X_BSPI1)
 
 /****************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ****************************************************************************/
 
 /* Configuration ************************************************************/