diff --git a/builtin/Makefile b/builtin/Makefile
index 9fd170be5..29f828dc7 100644
--- a/builtin/Makefile
+++ b/builtin/Makefile
@@ -39,7 +39,7 @@ include $(APPDIR)/Make.defs
 # Source and object files
 
 ASRCS		=
-CSRCS		= builtin.c builtin_list.c exec_builtin.c
+CSRCS		= builtin_forindex.c builtin_list.c exec_builtin.c
 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 COBJS		= $(CSRCS:.c=$(OBJEXT))
diff --git a/builtin/builtin.c b/builtin/builtin_forindex.c
similarity index 76%
rename from builtin/builtin.c
rename to builtin/builtin_forindex.c
index d26f0a044..ba8b184e7 100644
--- a/builtin/builtin.c
+++ b/builtin/builtin_forindex.c
@@ -1,8 +1,8 @@
 /****************************************************************************
- * apps/builtin/builtin.c
+ * apps/builtin/builtin_forindex.c
  *
  *   Copyright (C) 2011 Uros Platise. All rights reserved.
- *   Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2011, 2016 Gregory Nutt. All rights reserved.
  *   Authors: Uros Platise <uros.platise@isotel.eu>
  *            Gregory Nutt <gnutt@nuttx.org>
  *
@@ -43,14 +43,6 @@
 
 #include <nuttx/binfmt/builtin.h>
 
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-/****************************************************************************
- * Private Function Prototypes
- ****************************************************************************/
-
 /****************************************************************************
  * Public Data
  ****************************************************************************/
@@ -58,14 +50,6 @@
 extern const struct builtin_s g_builtins[];
 extern const int g_builtin_count;
 
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
 /****************************************************************************
  * Public Functions
  ****************************************************************************/
@@ -76,5 +60,6 @@ FAR const struct builtin_s *builtin_for_index(int index)
     {
       return &g_builtins[index];
     }
+
   return NULL;
 }