diff --git a/configs/mikroe-stm32f4/kernel/Makefile b/configs/mikroe-stm32f4/kernel/Makefile
index c452e00d219..1ba60bb8ccd 100644
--- a/configs/mikroe-stm32f4/kernel/Makefile
+++ b/configs/mikroe-stm32f4/kernel/Makefile
@@ -71,7 +71,7 @@ USER_LIBGCC = "${shell $(CC) -print-libgcc-file-name}"
 
 # Source files
 
-CSRCS = up_userspace.c
+CSRCS = stm32_userspace.c
 COBJS = $(CSRCS:.c=$(OBJEXT))
 OBJS  = $(COBJS)
 
diff --git a/configs/mikroe-stm32f4/kernel/up_userspace.c b/configs/mikroe-stm32f4/kernel/stm32_userspace.c
similarity index 99%
rename from configs/mikroe-stm32f4/kernel/up_userspace.c
rename to configs/mikroe-stm32f4/kernel/stm32_userspace.c
index 372d5302a09..18f19757fce 100644
--- a/configs/mikroe-stm32f4/kernel/up_userspace.c
+++ b/configs/mikroe-stm32f4/kernel/stm32_userspace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/mikroe-stm32f4/kernel/up_userspace.c
+ * configs/mikroe-stm32f4/kernel/stm32_userspace.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/open1788/kernel/Makefile b/configs/open1788/kernel/Makefile
index 0fb06a926bd..bd16441f25c 100644
--- a/configs/open1788/kernel/Makefile
+++ b/configs/open1788/kernel/Makefile
@@ -71,7 +71,7 @@ USER_LIBGCC = "${shell $(CC) -print-libgcc-file-name}"
 
 # Source files
 
-CSRCS = up_userspace.c
+CSRCS = lpc17_userspace.c
 COBJS = $(CSRCS:.c=$(OBJEXT))
 OBJS  = $(COBJS)
 
diff --git a/configs/open1788/kernel/up_userspace.c b/configs/open1788/kernel/lpc17_userspace.c
similarity index 99%
rename from configs/open1788/kernel/up_userspace.c
rename to configs/open1788/kernel/lpc17_userspace.c
index a003fae3a6b..90007799014 100644
--- a/configs/open1788/kernel/up_userspace.c
+++ b/configs/open1788/kernel/lpc17_userspace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/open1788/kernel/up_userspace.c
+ * configs/open1788/kernel/lpc17_userspace.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/sam3u-ek/kernel/Makefile b/configs/sam3u-ek/kernel/Makefile
index 8bf42273d53..48db5e7ae10 100644
--- a/configs/sam3u-ek/kernel/Makefile
+++ b/configs/sam3u-ek/kernel/Makefile
@@ -65,7 +65,7 @@ USER_LIBGCC = "${shell $(CC) -print-libgcc-file-name}"
 
 # Source files
 
-CSRCS = up_userspace.c
+CSRCS = sam_userspace.c
 COBJS = $(CSRCS:.c=$(OBJEXT))
 OBJS  = $(COBJS)
 
diff --git a/configs/sam3u-ek/kernel/up_userspace.c b/configs/sam3u-ek/kernel/sam_userspace.c
similarity index 99%
rename from configs/sam3u-ek/kernel/up_userspace.c
rename to configs/sam3u-ek/kernel/sam_userspace.c
index db65b58e1a4..fed33dd3920 100644
--- a/configs/sam3u-ek/kernel/up_userspace.c
+++ b/configs/sam3u-ek/kernel/sam_userspace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/sam3u-ek/kernel/up_userspace.c
+ * configs/sam3u-ek/kernel/sam_userspace.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm3240g-eval/kernel/Makefile b/configs/stm3240g-eval/kernel/Makefile
index 1ca76cc6163..428c098bdd5 100644
--- a/configs/stm3240g-eval/kernel/Makefile
+++ b/configs/stm3240g-eval/kernel/Makefile
@@ -71,7 +71,7 @@ USER_LIBGCC = "${shell $(CC) -print-libgcc-file-name}"
 
 # Source files
 
-CSRCS = up_userspace.c
+CSRCS = stm32_userspace.c
 COBJS = $(CSRCS:.c=$(OBJEXT))
 OBJS  = $(COBJS)
 
diff --git a/configs/stm3240g-eval/kernel/up_userspace.c b/configs/stm3240g-eval/kernel/stm32_userspace.c
similarity index 99%
rename from configs/stm3240g-eval/kernel/up_userspace.c
rename to configs/stm3240g-eval/kernel/stm32_userspace.c
index 4d7b8e225a8..f27209584a9 100644
--- a/configs/stm3240g-eval/kernel/up_userspace.c
+++ b/configs/stm3240g-eval/kernel/stm32_userspace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm3240g-eval/kernel/up_userspace.c
+ * configs/stm3240g-eval/kernel/stm32_userspace.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/configs/stm32f4discovery/kernel/Makefile b/configs/stm32f4discovery/kernel/Makefile
index 67da110881d..48b2584d8e7 100644
--- a/configs/stm32f4discovery/kernel/Makefile
+++ b/configs/stm32f4discovery/kernel/Makefile
@@ -71,7 +71,7 @@ USER_LIBGCC = "${shell $(CC) -print-libgcc-file-name}"
 
 # Source files
 
-CSRCS = up_userspace.c
+CSRCS = stm32_userspace.c
 COBJS = $(CSRCS:.c=$(OBJEXT))
 OBJS  = $(COBJS)
 
diff --git a/configs/stm32f4discovery/kernel/up_userspace.c b/configs/stm32f4discovery/kernel/stm32_userspace.c
similarity index 99%
rename from configs/stm32f4discovery/kernel/up_userspace.c
rename to configs/stm32f4discovery/kernel/stm32_userspace.c
index 47d3d83279d..3b6108eeded 100644
--- a/configs/stm32f4discovery/kernel/up_userspace.c
+++ b/configs/stm32f4discovery/kernel/stm32_userspace.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/stm32f4discovery/kernel/up_userspace.c
+ * configs/stm32f4discovery/kernel/stm32_userspace.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>