diff --git a/arch/sim/src/up_allocateheap.c b/arch/sim/src/up_allocateheap.c
index e6641805e67..61fb6cf6b39 100644
--- a/arch/sim/src/up_allocateheap.c
+++ b/arch/sim/src/up_allocateheap.c
@@ -46,7 +46,7 @@
 
 #include <nuttx/arch.h>
 
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_blockdevice.c b/arch/sim/src/up_blockdevice.c
index 41a66b7e2fa..5173d9b0bfd 100644
--- a/arch/sim/src/up_blockdevice.c
+++ b/arch/sim/src/up_blockdevice.c
@@ -46,7 +46,7 @@
 
 #include <nuttx/fs/ramdisk.h>
 
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_blocktask.c b/arch/sim/src/up_blocktask.c
index b708fd80d22..58ec9310760 100644
--- a/arch/sim/src/up_blocktask.c
+++ b/arch/sim/src/up_blocktask.c
@@ -46,7 +46,7 @@
 #include <nuttx/arch.h>
 
 #include "sched/sched.h"
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_createstack.c b/arch/sim/src/up_createstack.c
index 9fbe1bc49e9..b74c04c4503 100644
--- a/arch/sim/src/up_createstack.c
+++ b/arch/sim/src/up_createstack.c
@@ -45,7 +45,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_devconsole.c b/arch/sim/src/up_devconsole.c
index 545e8231970..a8174930718 100644
--- a/arch/sim/src/up_devconsole.c
+++ b/arch/sim/src/up_devconsole.c
@@ -45,7 +45,7 @@
 
 #include <nuttx/fs/fs.h>
 
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_deviceimage.c b/arch/sim/src/up_deviceimage.c
index 4dfe726ffc4..346adb3a24e 100644
--- a/arch/sim/src/up_deviceimage.c
+++ b/arch/sim/src/up_deviceimage.c
@@ -50,7 +50,7 @@
 
 # include <nuttx/kmalloc.h>
 
-# include "sim.h"
+# include "up_internal.h"
 #endif
 
 /****************************************************************************
diff --git a/arch/sim/src/up_exit.c b/arch/sim/src/up_exit.c
index 7b6161da7e5..f82c51caf78 100644
--- a/arch/sim/src/up_exit.c
+++ b/arch/sim/src/up_exit.c
@@ -46,7 +46,7 @@
 
 #include "task/task.h"
 #include "sched/sched.h"
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_framebuffer.c b/arch/sim/src/up_framebuffer.c
index 86b4b65d74d..0bf9bd14c47 100644
--- a/arch/sim/src/up_framebuffer.c
+++ b/arch/sim/src/up_framebuffer.c
@@ -45,7 +45,7 @@
 #include <debug.h>
 
 #include <nuttx/video/fb.h>
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_idle.c b/arch/sim/src/up_idle.c
index eaea6d7fe22..0106c29597d 100644
--- a/arch/sim/src/up_idle.c
+++ b/arch/sim/src/up_idle.c
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/power/pm.h>
 
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_initialize.c b/arch/sim/src/up_initialize.c
index 07c140a4c8d..0ab1add7ff5 100644
--- a/arch/sim/src/up_initialize.c
+++ b/arch/sim/src/up_initialize.c
@@ -47,7 +47,7 @@
 #include <nuttx/mtd/mtd.h>
 #include <nuttx/syslog/ramlog.h>
 
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_initialstate.c b/arch/sim/src/up_initialstate.c
index ff4898a9121..3362f84244f 100644
--- a/arch/sim/src/up_initialstate.c
+++ b/arch/sim/src/up_initialstate.c
@@ -44,7 +44,7 @@
 
 #include <nuttx/arch.h>
 
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/sim.h b/arch/sim/src/up_internal.h
similarity index 97%
rename from arch/sim/src/sim.h
rename to arch/sim/src/up_internal.h
index 9fdace1c93a..b6b24c1eeef 100644
--- a/arch/sim/src/sim.h
+++ b/arch/sim/src/up_internal.h
@@ -1,7 +1,7 @@
 /**************************************************************************
- * arch/sim/src/sim.h
+ * arch/sim/src/up_internal.h
  *
- *   Copyright (C) 2007, 2009, 2011-2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011-2012, 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  **************************************************************************/
 
-#ifndef __ARCH_SIM_SRC_SIM_H
-#define __ARCH_SIM_SRC_SIM_H
+#ifndef __ARCH_SIM_SRC_UP_INTERNAL_H
+#define __ARCH_SIM_SRC_UP_INTERNAL_H
 
 /**************************************************************************
  * Included Files
@@ -248,4 +248,4 @@ struct spi_dev_s *up_spiflashinitialize(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __ARCH_SIM_SRC_SIM_H */
+#endif /* __ARCH_SIM_SRC_UP_INTERNAL_H */
diff --git a/arch/sim/src/up_interruptcontext.c b/arch/sim/src/up_interruptcontext.c
index 6dda092aac7..d74510887b4 100644
--- a/arch/sim/src/up_interruptcontext.c
+++ b/arch/sim/src/up_interruptcontext.c
@@ -41,7 +41,7 @@
 
 #include <stdbool.h>
 #include <nuttx/arch.h>
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_netdriver.c b/arch/sim/src/up_netdriver.c
index 8d40d7d30e1..c6636a0454b 100644
--- a/arch/sim/src/up_netdriver.c
+++ b/arch/sim/src/up_netdriver.c
@@ -56,7 +56,7 @@
 #include <nuttx/net/netdev.h>
 #include <nuttx/net/arp.h>
 
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_releasepending.c b/arch/sim/src/up_releasepending.c
index fb324bab17d..21c1a1f8551 100644
--- a/arch/sim/src/up_releasepending.c
+++ b/arch/sim/src/up_releasepending.c
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 
 #include "sched/sched.h"
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_releasestack.c b/arch/sim/src/up_releasestack.c
index dde67a0f1bf..c785c5a4afe 100644
--- a/arch/sim/src/up_releasestack.c
+++ b/arch/sim/src/up_releasestack.c
@@ -44,7 +44,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/kmalloc.h>
 
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_reprioritizertr.c b/arch/sim/src/up_reprioritizertr.c
index 5bea181140e..125542a71f3 100644
--- a/arch/sim/src/up_reprioritizertr.c
+++ b/arch/sim/src/up_reprioritizertr.c
@@ -47,7 +47,7 @@
 #include <nuttx/arch.h>
 
 #include "sched/sched.h"
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_schedulesigaction.c b/arch/sim/src/up_schedulesigaction.c
index d1ea0a5703c..c93bb6d6726 100644
--- a/arch/sim/src/up_schedulesigaction.c
+++ b/arch/sim/src/up_schedulesigaction.c
@@ -45,7 +45,7 @@
 #include <nuttx/arch.h>
 
 #include "sched/sched.h"
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_setjmp.S b/arch/sim/src/up_setjmp.S
index 23cdda4df4a..3c61d3720c0 100644
--- a/arch/sim/src/up_setjmp.S
+++ b/arch/sim/src/up_setjmp.S
@@ -37,7 +37,7 @@
  * Included Files
  **************************************************************************/
 
-#include "sim.h"
+#include "up_internal.h"
 
 /**************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_simuart.c b/arch/sim/src/up_simuart.c
index 239e5bd790c..d3bd202b73d 100644
--- a/arch/sim/src/up_simuart.c
+++ b/arch/sim/src/up_simuart.c
@@ -46,7 +46,7 @@
  ****************************************************************************/
 
 /* Simulated console UART input buffer size */
-/* Must match the defintion in sim.h */
+/* Must match the defintion in up_internal.h */
 
 #define SIMUART_BUFSIZE 256
 
diff --git a/arch/sim/src/up_spiflash.c b/arch/sim/src/up_spiflash.c
index 04329dcb424..0118dd76383 100644
--- a/arch/sim/src/up_spiflash.c
+++ b/arch/sim/src/up_spiflash.c
@@ -50,7 +50,7 @@
 #include <nuttx/arch.h>
 #include <nuttx/spi/spi.h>
 
-#include "sim.h"
+#include "up_internal.h"
 
 #if defined(CONFIG_SIM_SPIFLASH)
 
diff --git a/arch/sim/src/up_stackframe.c b/arch/sim/src/up_stackframe.c
index 648e94a8412..ef649859830 100644
--- a/arch/sim/src/up_stackframe.c
+++ b/arch/sim/src/up_stackframe.c
@@ -47,7 +47,7 @@
 #include <nuttx/arch.h>
 #include <arch/irq.h>
 
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Macros
diff --git a/arch/sim/src/up_touchscreen.c b/arch/sim/src/up_touchscreen.c
index 95cae2e33ae..9ee99cbe927 100644
--- a/arch/sim/src/up_touchscreen.c
+++ b/arch/sim/src/up_touchscreen.c
@@ -59,7 +59,7 @@
 
 #include <nuttx/input/touchscreen.h>
 
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_uartwait.c b/arch/sim/src/up_uartwait.c
index 35d4dbd2c73..3abe70008c7 100644
--- a/arch/sim/src/up_uartwait.c
+++ b/arch/sim/src/up_uartwait.c
@@ -39,7 +39,7 @@
 
 #include <semaphore.h>
 
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_unblocktask.c b/arch/sim/src/up_unblocktask.c
index 2d6e6fc91a5..86edecbb52d 100644
--- a/arch/sim/src/up_unblocktask.c
+++ b/arch/sim/src/up_unblocktask.c
@@ -45,7 +45,7 @@
 
 #include "clock/clock.h"
 #include "sched/sched.h"
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/sim/src/up_usestack.c b/arch/sim/src/up_usestack.c
index 7fcc3c9d1c6..3121b59bd0f 100644
--- a/arch/sim/src/up_usestack.c
+++ b/arch/sim/src/up_usestack.c
@@ -41,7 +41,7 @@
 #include <sys/types.h>
 #include <debug.h>
 #include <nuttx/arch.h>
-#include "sim.h"
+#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions