diff --git a/configs/skp16c26/src/Makefile b/configs/skp16c26/src/Makefile
index c5e6f5018c..8b4f1312c6 100644
--- a/configs/skp16c26/src/Makefile
+++ b/configs/skp16c26/src/Makefile
@@ -35,18 +35,18 @@
 
 -include $(TOPDIR)/Make.defs
 
-CFLAGS		+= -I$(TOPDIR)/sched
+CFLAGS += -I$(TOPDIR)/sched
 
-ASRCS		=
-AOBJS		= $(ASRCS:.S=$(OBJEXT))
-CSRCS		= up_leds.c up_buttons.c up_lcd.c up_lcdconsole.c
-COBJS		= $(CSRCS:.c=$(OBJEXT))
+ASRCS =
+AOBJS = $(ASRCS:.S=$(OBJEXT))
+CSRCS = m16c_leds.c m16c_buttons.c m16c_lcd.c m16c_lcdconsole.c
+COBJS = $(CSRCS:.c=$(OBJEXT))
 
-SRCS		= $(ASRCS) $(CSRCS)
-OBJS		= $(AOBJS) $(COBJS)
+SRCS = $(ASRCS) $(CSRCS)
+OBJS = $(AOBJS) $(COBJS)
 
-ARCH_SRCDIR	= $(TOPDIR)/arch/$(CONFIG_ARCH)/src
-CFLAGS		+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common
+ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
+CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common
 
 all: libboard$(LIBEXT)
 
diff --git a/configs/skp16c26/src/up_buttons.c b/configs/skp16c26/src/m16c_buttons.c
similarity index 99%
rename from configs/skp16c26/src/up_buttons.c
rename to configs/skp16c26/src/m16c_buttons.c
index 8ecb050464..4841fefe82 100644
--- a/configs/skp16c26/src/up_buttons.c
+++ b/configs/skp16c26/src/m16c_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/skp16c26/src/board_buttons.c
+ * configs/skp16c26/src/m16c_buttons.c
  *
  *   Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/skp16c26/src/up_lcd.c b/configs/skp16c26/src/m16c_lcd.c
similarity index 99%
rename from configs/skp16c26/src/up_lcd.c
rename to configs/skp16c26/src/m16c_lcd.c
index 440be0d591..fdbf97606f 100644
--- a/configs/skp16c26/src/up_lcd.c
+++ b/configs/skp16c26/src/m16c_lcd.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/scp16c26/src/up_lcd.c
+ * configs/scp16c26/src/m16c_lcd.c
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -50,7 +50,7 @@
 #ifdef CONFIG_LCD
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /* LCD dimensions *******************************************************************/
diff --git a/configs/skp16c26/src/up_lcdconsole.c b/configs/skp16c26/src/m16c_lcdconsole.c
similarity index 98%
rename from configs/skp16c26/src/up_lcdconsole.c
rename to configs/skp16c26/src/m16c_lcdconsole.c
index e837870ad4..90731326e8 100644
--- a/configs/skp16c26/src/up_lcdconsole.c
+++ b/configs/skp16c26/src/m16c_lcdconsole.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/scp16c26/src/up_lcd.c
+ * configs/scp16c26/src/m16c_lcdconsole.c
  *
  *   Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -59,7 +59,7 @@
 #if !defined(HAVE_SERIALCONSOLE) && defined(CONFIG_LCD) && defined(CONFIG_LCD_CONSOLE)
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
 /************************************************************************************
diff --git a/configs/skp16c26/src/up_leds.c b/configs/skp16c26/src/m16c_leds.c
similarity index 99%
rename from configs/skp16c26/src/up_leds.c
rename to configs/skp16c26/src/m16c_leds.c
index f3d4ef1b24..31bcdf8c81 100644
--- a/configs/skp16c26/src/up_leds.c
+++ b/configs/skp16c26/src/m16c_leds.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/scp16c26/src/up_leds.c
+ * configs/scp16c26/src/m16c_leds.c
  *
  *   Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/skp16c26/src/skp16c26_internal.h b/configs/skp16c26/src/skp16c26_internal.h
index 5b81f49c2f..76bc68f89b 100644
--- a/configs/skp16c26/src/skp16c26_internal.h
+++ b/configs/skp16c26/src/skp16c26_internal.h
@@ -41,12 +41,12 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Definitions
+ * Pre-processor Definitions
  ************************************************************************************/
 
-/********************************************************************************/
-/* Macro Definitions 															*/
-/********************************************************************************/
+/************************************************************************************
+ * Macro Definitions
+ ************************************************************************************/
 
 /************************************************************************************
  * Inline Functions