diff --git a/ChangeLog b/ChangeLog
index f08c0ac1a3..aca800c8cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -337,7 +337,7 @@
 0.3.9 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
 
 	* Began adding support for the ZiLOG Z8Encore! microcontroller for the Z8Encore000ZCO
-	  development board and the Z8F642 part.
+	  development board and the Z8F6403 part.
 	* Fix broken 'clean' target on z80sim configurations
 	* Re-structure arch/z80 to provide support for all ZiLOG 8-bit microcontrollers (ez8
 	  in particular for now).
diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index a3762e77e1..90d8dd1a0c 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -615,7 +615,7 @@
   <td>
     <p>
       <b>Zilog Z8Encore! Microncontroller</b>.
-      This port use the Zilog z8encore000zco development kit, Z8F642 part, and the Zilog
+      This port use the Zilog z8encore000zco development kit, Z8F6403 part, and the Zilog
       ZDS-II Windows command line tools.
       The development environment is Cygwin under WinXP.
     </p>
@@ -991,7 +991,7 @@ buildroot-0.1.0 2007-03-09 &lt;spudmonkey@racsa.co.cr&gt
 nuttx-0.3.9 2008-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
 	* Began adding support for the ZiLOG Z8Encore! microcontroller for the Z8Encore000ZCO
-	  development board and the Z8F642 part.
+	  development board and the Z8F6403 part.
 	* Fix broken 'clean' target on z80sim configurations
 	* Re-structure arch/z80 to provide support for all ZiLOG 8-bit microcontrollers (ez8
 	  in particular for now).
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 9a668d86c5..fcf74416c5 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -448,7 +448,7 @@
 
       <li><code>arch/z80/include/z8</code> and <code>arch/z80/src/z8</code>:
         The Z8Encore! port use the Zilog z8encore000zco
-        development kit, Z8F642 part, and the Zilog ZDS-II Windows command line
+        development kit, Z8F6403 part, and the Zilog ZDS-II Windows command line
         tools.  The development environment is Cygwin under WinXP.
         This port is in progress and will be released in a future NuttX release.
       </li>
@@ -646,7 +646,7 @@
 
   <li><code>configs/z8encore000zco</code>
     z8Encore! Microncontroller.  This port use the Zilog z8encore000zco
-    development kit, Z8F642 part, and the Zilog ZDS-II Windows command line
+    development kit, Z8F6403 part, and the Zilog ZDS-II Windows command line
     tools.  The development environment is Cygwin under WinXP.
   </li>
 
diff --git a/configs/README.txt b/configs/README.txt
index 6646c6964c..ea9dedaf8d 100644
--- a/configs/README.txt
+++ b/configs/README.txt
@@ -340,7 +340,7 @@ configs/z16f2800100zcog
 
 configs/z8encore000zco
     z8Encore! Microncontroller.  This port use the Zilog z8encore000zco
-    development kit, Z8F642 part, and the Zilog ZDS-II Windows command line
+    development kit, Z8F6403 part, and the Zilog ZDS-II Windows command line
     tools.  The development environment is Cygwin under WinXP.
 
 configs/z80zim
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index 5fa382a593..63ea9ff16a 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -60,7 +60,7 @@ CONFIG_ARCH=z80
 CONFIG_ARCH_Z8=y
 CONFIG_ARCH_CHIP=z8
 CONFIG_ARCH_CHIP_Z8=y
-CONFIG_ARCH_CHIP_Z8F642=y
+CONFIG_ARCH_CHIP_Z8F6403=y
 CONFIG_ARCH_BOARD=z8encore000zco
 CONFIG_ARCH_BOARD_Z8ENCORE000ZCO=y
 CONFIG_BOARD_LOOPSPERMSEC=1250