diff --git a/arch/pjrc-8051/include/arch.h b/arch/8051/include/arch.h
similarity index 100%
rename from arch/pjrc-8051/include/arch.h
rename to arch/8051/include/arch.h
diff --git a/arch/pjrc-8051/include/irq.h b/arch/8051/include/irq.h
similarity index 100%
rename from arch/pjrc-8051/include/irq.h
rename to arch/8051/include/irq.h
diff --git a/arch/pjrc-8051/include/limits.h b/arch/8051/include/limits.h
similarity index 92%
rename from arch/pjrc-8051/include/limits.h
rename to arch/8051/include/limits.h
index fa93f188c1c..3344a8d2d9f 100644
--- a/arch/pjrc-8051/include/limits.h
+++ b/arch/8051/include/limits.h
@@ -1,7 +1,7 @@
 /************************************************************
- * arch/pjrc-8051/include/limits.h
+ * arch/8051/include/limits.h
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
  *
  ************************************************************/
 
-#ifndef __ARCH_PJRC8051_INCLUDE_LIMITS_H 
-#define __ARCH_PJRC8051_INCLUDE_LIMITS_H 
+#ifndef __ARCH_8051_INCLUDE_LIMITS_H 
+#define __ARCH_8051_INCLUDE_LIMITS_H 
 
 /************************************************************
  * Included Files
@@ -76,4 +76,4 @@
 #define PTR_MAX     0x7fffff
 #define UPTR_MAX    0xffffff
 
-#endif /* __ARCH_PJRC8051_INCLUDE_LIMITS_H  */
+#endif /* __ARCH_8051_INCLUDE_LIMITS_H  */
diff --git a/arch/pjrc-8051/include/types.h b/arch/8051/include/types.h
similarity index 94%
rename from arch/pjrc-8051/include/types.h
rename to arch/8051/include/types.h
index 45141634c1e..7495513b2cb 100644
--- a/arch/pjrc-8051/include/types.h
+++ b/arch/8051/include/types.h
@@ -1,7 +1,7 @@
 /************************************************************************
- * arch/pjrc-8051/include/types.h
+ * arch/8051/include/types.h
  *
- *   Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2009, 2011 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -37,8 +37,8 @@
  * only indirectly through sys/types.h
  */
 
-#ifndef __ARCH_PJRC8051_INCLUDE_TYPES_H 
-#define __ARCH_PJRC8051_INCLUDE_TYPES_H 
+#ifndef __ARCH_8051_INCLUDE_TYPES_H 
+#define __ARCH_8051_INCLUDE_TYPES_H 
 
 /************************************************************************
  * Included Files
@@ -95,4 +95,4 @@ typedef unsigned char      irqstate_t;
  * Global Function Prototypes
  ************************************************************************/
 
-#endif /* __ARCH_PJRC8051_INCLUDE_TYPES_H  */
+#endif /* __ARCH_8051_INCLUDE_TYPES_H  */
diff --git a/arch/pjrc-8051/src/Makefile b/arch/8051/src/Makefile
similarity index 98%
rename from arch/pjrc-8051/src/Makefile
rename to arch/8051/src/Makefile
index d77bf546dd7..9152bfa3677 100644
--- a/arch/pjrc-8051/src/Makefile
+++ b/arch/8051/src/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
-# arch/pjrc-8051/src/Makefile
+# arch/8051/src/Makefile
 #
-#   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007, 2008, 2011 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/arch/pjrc-8051/src/up_allocateheap.c b/arch/8051/src/up_allocateheap.c
similarity index 100%
rename from arch/pjrc-8051/src/up_allocateheap.c
rename to arch/8051/src/up_allocateheap.c
diff --git a/arch/pjrc-8051/src/up_assert.c b/arch/8051/src/up_assert.c
similarity index 100%
rename from arch/pjrc-8051/src/up_assert.c
rename to arch/8051/src/up_assert.c
diff --git a/arch/pjrc-8051/src/up_blocktask.c b/arch/8051/src/up_blocktask.c
similarity index 100%
rename from arch/pjrc-8051/src/up_blocktask.c
rename to arch/8051/src/up_blocktask.c
diff --git a/arch/pjrc-8051/src/up_debug.c b/arch/8051/src/up_debug.c
similarity index 100%
rename from arch/pjrc-8051/src/up_debug.c
rename to arch/8051/src/up_debug.c
diff --git a/arch/pjrc-8051/src/up_delay.c b/arch/8051/src/up_delay.c
similarity index 100%
rename from arch/pjrc-8051/src/up_delay.c
rename to arch/8051/src/up_delay.c
diff --git a/arch/pjrc-8051/src/up_exit.c b/arch/8051/src/up_exit.c
similarity index 100%
rename from arch/pjrc-8051/src/up_exit.c
rename to arch/8051/src/up_exit.c
diff --git a/arch/pjrc-8051/src/up_head.S b/arch/8051/src/up_head.S
similarity index 100%
rename from arch/pjrc-8051/src/up_head.S
rename to arch/8051/src/up_head.S
diff --git a/arch/pjrc-8051/src/up_idle.c b/arch/8051/src/up_idle.c
similarity index 100%
rename from arch/pjrc-8051/src/up_idle.c
rename to arch/8051/src/up_idle.c
diff --git a/arch/pjrc-8051/src/up_initialize.c b/arch/8051/src/up_initialize.c
similarity index 100%
rename from arch/pjrc-8051/src/up_initialize.c
rename to arch/8051/src/up_initialize.c
diff --git a/arch/pjrc-8051/src/up_initialstate.c b/arch/8051/src/up_initialstate.c
similarity index 100%
rename from arch/pjrc-8051/src/up_initialstate.c
rename to arch/8051/src/up_initialstate.c
diff --git a/arch/pjrc-8051/src/up_internal.h b/arch/8051/src/up_internal.h
similarity index 100%
rename from arch/pjrc-8051/src/up_internal.h
rename to arch/8051/src/up_internal.h
diff --git a/arch/pjrc-8051/src/up_interruptcontext.c b/arch/8051/src/up_interruptcontext.c
similarity index 100%
rename from arch/pjrc-8051/src/up_interruptcontext.c
rename to arch/8051/src/up_interruptcontext.c
diff --git a/arch/pjrc-8051/src/up_irq.c b/arch/8051/src/up_irq.c
similarity index 100%
rename from arch/pjrc-8051/src/up_irq.c
rename to arch/8051/src/up_irq.c
diff --git a/arch/pjrc-8051/src/up_irqtest.c b/arch/8051/src/up_irqtest.c
similarity index 100%
rename from arch/pjrc-8051/src/up_irqtest.c
rename to arch/8051/src/up_irqtest.c
diff --git a/arch/pjrc-8051/src/up_putc.c b/arch/8051/src/up_putc.c
similarity index 100%
rename from arch/pjrc-8051/src/up_putc.c
rename to arch/8051/src/up_putc.c
diff --git a/arch/pjrc-8051/src/up_releasepending.c b/arch/8051/src/up_releasepending.c
similarity index 100%
rename from arch/pjrc-8051/src/up_releasepending.c
rename to arch/8051/src/up_releasepending.c
diff --git a/arch/pjrc-8051/src/up_reprioritizertr.c b/arch/8051/src/up_reprioritizertr.c
similarity index 100%
rename from arch/pjrc-8051/src/up_reprioritizertr.c
rename to arch/8051/src/up_reprioritizertr.c
diff --git a/arch/pjrc-8051/src/up_restorecontext.c b/arch/8051/src/up_restorecontext.c
similarity index 100%
rename from arch/pjrc-8051/src/up_restorecontext.c
rename to arch/8051/src/up_restorecontext.c
diff --git a/arch/pjrc-8051/src/up_savecontext.c b/arch/8051/src/up_savecontext.c
similarity index 100%
rename from arch/pjrc-8051/src/up_savecontext.c
rename to arch/8051/src/up_savecontext.c
diff --git a/arch/pjrc-8051/src/up_timerisr.c b/arch/8051/src/up_timerisr.c
similarity index 100%
rename from arch/pjrc-8051/src/up_timerisr.c
rename to arch/8051/src/up_timerisr.c
diff --git a/arch/pjrc-8051/src/up_unblocktask.c b/arch/8051/src/up_unblocktask.c
similarity index 100%
rename from arch/pjrc-8051/src/up_unblocktask.c
rename to arch/8051/src/up_unblocktask.c
diff --git a/arch/README.txt b/arch/README.txt
index 21296e99442..7ef23b3d39c 100644
--- a/arch/README.txt
+++ b/arch/README.txt
@@ -253,7 +253,7 @@ arch/sh - SuperH and related Hitachi/Renesas microcontrollers
     arch/sh/include/shs and arch/sh/src/sh1
         Support for the SH-1 processor.
 
-arch/pjrc-8051 - 8051/52 microcontrollers
+arch/8051 - 8051/52 microcontrollers
     8051 Microcontroller.  This port is not quite ready for prime time.
 
 arch/z16 - ZiLOG 16-bit processors