diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html
index ed0cc9ad24..357074fcb6 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -6746,7 +6746,7 @@ BFD_ASSERT (*plt_offset != (bfd_vma) -1);
No workaround is known at this time. This is a show stopper for M16C.
- Refer to the NuttX board README file for further information.
+ Refer to the NuttX board README file for further information.
diff --git a/Documentation/README.html b/Documentation/README.html
index de2da9748e..a77f68f081 100644
--- a/Documentation/README.html
+++ b/Documentation/README.html
@@ -440,9 +440,9 @@ nuttx/
| | `- or1k/
| | `- README.txt
| |- renesas/
- | | |- m32262f8/
+ | | |- m16c/
| | | `- skp16c26/
- | | | `- README.txt
+ | | | `- README.txt
| | `-sh7032/
| | `- us7032evb1/
| | `- README.txt
diff --git a/README.txt b/README.txt
index 67935838c6..6f4e5599dd 100644
--- a/README.txt
+++ b/README.txt
@@ -2152,7 +2152,7 @@ nuttx/
| | `- or1k/
| | `- README.txt
| |- renesas/
- | | |- m32262f8/
+ | | |- m16c/
| | | `- skp16c26/
| | | `- README.txt
| | `-sh7032/
diff --git a/boards/Kconfig b/boards/Kconfig
index ab29ab2262..43064b79ca 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -2753,7 +2753,7 @@ if ARCH_BOARD_OR1K
source "boards/or1k/mor1kx/or1k/Kconfig"
endif
if ARCH_BOARD_SKP16C26
-source "boards/renesas/m32262f8/skp16c26/Kconfig"
+source "boards/renesas/m16c/skp16c26/Kconfig"
endif
if ARCH_BOARD_US7032EVB1
source "boards/renesas/sh7032/us7032evb1/Kconfig"
diff --git a/boards/README.txt b/boards/README.txt
index c36b053344..644d682dce 100644
--- a/boards/README.txt
+++ b/boards/README.txt
@@ -717,7 +717,7 @@ boards/arm/stm32/shenzhou
This is the port of NuttX to the Shenzhou development board from
www.armjishu.com. This board features the STMicro STM32F107VCT MCU.
-boards/renesas/m32262f8/skp16c26
+boards/renesas/m16c/skp16c26
Renesas M16C processor on the Renesas SKP16C26 StarterKit. This port
uses the GNU m32c toolchain. STATUS: The port is complete but untested
due to issues with compiler internal errors.
diff --git a/boards/renesas/m32262f8/drivers/Kconfig b/boards/renesas/m16c/drivers/Kconfig
similarity index 100%
rename from boards/renesas/m32262f8/drivers/Kconfig
rename to boards/renesas/m16c/drivers/Kconfig
diff --git a/boards/renesas/m32262f8/skp16c26/Kconfig b/boards/renesas/m16c/skp16c26/Kconfig
similarity index 100%
rename from boards/renesas/m32262f8/skp16c26/Kconfig
rename to boards/renesas/m16c/skp16c26/Kconfig
diff --git a/boards/renesas/m32262f8/skp16c26/README.txt b/boards/renesas/m16c/skp16c26/README.txt
similarity index 98%
rename from boards/renesas/m32262f8/skp16c26/README.txt
rename to boards/renesas/m16c/skp16c26/README.txt
index f0fa8417fe..56934c54ed 100644
--- a/boards/renesas/m32262f8/skp16c26/README.txt
+++ b/boards/renesas/m16c/skp16c26/README.txt
@@ -1,4 +1,4 @@
-boards/renesas/m32262f8/skp16c26/README.txt
+boards/renesas/m16c/skp16c26/README.txt
^^^^^^^^^^^^^^^^^^^^^^^^^^^
1. The buildroot package can be used to build an M16C toolchain. The toolchain
diff --git a/boards/renesas/m32262f8/skp16c26/configs/ostest/defconfig b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig
similarity index 97%
rename from boards/renesas/m32262f8/skp16c26/configs/ostest/defconfig
rename to boards/renesas/m16c/skp16c26/configs/ostest/defconfig
index 8b812bb29a..2465ac9dab 100644
--- a/boards/renesas/m32262f8/skp16c26/configs/ostest/defconfig
+++ b/boards/renesas/m16c/skp16c26/configs/ostest/defconfig
@@ -9,7 +9,7 @@
CONFIG_ARCH="renesas"
CONFIG_ARCH_BOARD="skp16c26"
CONFIG_ARCH_BOARD_SKP16C26=y
-CONFIG_ARCH_CHIP="m32262f8"
+CONFIG_ARCH_CHIP="m16c"
CONFIG_ARCH_CHIP_M30262F8=y
CONFIG_ARCH_INTERRUPTSTACK=128
CONFIG_ARCH_RENESAS=y
diff --git a/boards/renesas/m32262f8/skp16c26/include/board.h b/boards/renesas/m16c/skp16c26/include/board.h
similarity index 98%
rename from boards/renesas/m32262f8/skp16c26/include/board.h
rename to boards/renesas/m16c/skp16c26/include/board.h
index 4defdfea56..8f27f92228 100644
--- a/boards/renesas/m32262f8/skp16c26/include/board.h
+++ b/boards/renesas/m16c/skp16c26/include/board.h
@@ -1,6 +1,5 @@
/****************************************************************************
- * boards/renesas/m32262f8/skp16c26/include/board.h
- * arch/board/board.h
+ * boards/renesas/m16c/skp16c26/include/board.h
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/renesas/m32262f8/skp16c26/scripts/Make.defs b/boards/renesas/m16c/skp16c26/scripts/Make.defs
similarity index 98%
rename from boards/renesas/m32262f8/skp16c26/scripts/Make.defs
rename to boards/renesas/m16c/skp16c26/scripts/Make.defs
index f6961dedc4..de8e7d7fe7 100644
--- a/boards/renesas/m32262f8/skp16c26/scripts/Make.defs
+++ b/boards/renesas/m16c/skp16c26/scripts/Make.defs
@@ -1,5 +1,5 @@
############################################################################
-# boards/renesas/m32262f8/skp16c26/scripts/Make.defs
+# boards/renesas/m16c/skp16c26/scripts/Make.defs
#
# Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt
diff --git a/boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld b/boards/renesas/m16c/skp16c26/scripts/skp16c26.ld
similarity index 98%
rename from boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld
rename to boards/renesas/m16c/skp16c26/scripts/skp16c26.ld
index 38618d9b1e..52c4e6b02a 100644
--- a/boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld
+++ b/boards/renesas/m16c/skp16c26/scripts/skp16c26.ld
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/renesas/m32262f8/skp16c26/scripts/skp16c26.ld
+ * boards/renesas/m16c/skp16c26/scripts/skp16c26.ld
*
* Copyright (C) 2009, 2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/renesas/m32262f8/skp16c26/src/.gitignore b/boards/renesas/m16c/skp16c26/src/.gitignore
similarity index 100%
rename from boards/renesas/m32262f8/skp16c26/src/.gitignore
rename to boards/renesas/m16c/skp16c26/src/.gitignore
diff --git a/boards/renesas/m32262f8/skp16c26/src/Makefile b/boards/renesas/m16c/skp16c26/src/Makefile
similarity index 98%
rename from boards/renesas/m32262f8/skp16c26/src/Makefile
rename to boards/renesas/m16c/skp16c26/src/Makefile
index 26335724cf..e448c7ff3e 100644
--- a/boards/renesas/m32262f8/skp16c26/src/Makefile
+++ b/boards/renesas/m16c/skp16c26/src/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# boards/renesas/m32262f8/skp16c26/src/Makefile
+# boards/renesas/m16c/skp16c26/src/Makefile
#
# Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt
diff --git a/boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c b/boards/renesas/m16c/skp16c26/src/m16c_buttons.c
similarity index 98%
rename from boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c
rename to boards/renesas/m16c/skp16c26/src/m16c_buttons.c
index 4647decb57..871bd06b93 100644
--- a/boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c
+++ b/boards/renesas/m16c/skp16c26/src/m16c_buttons.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/renesas/m32262f8/skp16c26/src/m16c_buttons.c
+ * boards/renesas/m16c/skp16c26/src/m16c_buttons.c
*
* Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/renesas/m32262f8/skp16c26/src/m16c_lcd.c b/boards/renesas/m16c/skp16c26/src/m16c_lcd.c
similarity index 99%
rename from boards/renesas/m32262f8/skp16c26/src/m16c_lcd.c
rename to boards/renesas/m16c/skp16c26/src/m16c_lcd.c
index 31def78db3..cbe839ad6e 100644
--- a/boards/renesas/m32262f8/skp16c26/src/m16c_lcd.c
+++ b/boards/renesas/m16c/skp16c26/src/m16c_lcd.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/renesas/m32262f8/scp16c26/src/m16c_lcd.c
+ * boards/renesas/m16c/scp16c26/src/m16c_lcd.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/renesas/m32262f8/skp16c26/src/m16c_lcdconsole.c b/boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c
similarity index 98%
rename from boards/renesas/m32262f8/skp16c26/src/m16c_lcdconsole.c
rename to boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c
index 380b84884a..d5fe115071 100644
--- a/boards/renesas/m32262f8/skp16c26/src/m16c_lcdconsole.c
+++ b/boards/renesas/m16c/skp16c26/src/m16c_lcdconsole.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/renesas/m32262f8/scp16c26/src/m16c_lcdconsole.c
+ * boards/renesas/m16c/scp16c26/src/m16c_lcdconsole.c
*
* Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/renesas/m32262f8/skp16c26/src/m16c_leds.c b/boards/renesas/m16c/skp16c26/src/m16c_leds.c
similarity index 99%
rename from boards/renesas/m32262f8/skp16c26/src/m16c_leds.c
rename to boards/renesas/m16c/skp16c26/src/m16c_leds.c
index 068c0b94a4..26624d9423 100644
--- a/boards/renesas/m32262f8/skp16c26/src/m16c_leds.c
+++ b/boards/renesas/m16c/skp16c26/src/m16c_leds.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/renesas/m32262f8/scp16c26/src/m16c_leds.c
+ * boards/renesas/m16c/scp16c26/src/m16c_leds.c
*
* Copyright (C) 2009, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/boards/renesas/m32262f8/skp16c26/src/skp16c26.h b/boards/renesas/m16c/skp16c26/src/skp16c26.h
similarity index 98%
rename from boards/renesas/m32262f8/skp16c26/src/skp16c26.h
rename to boards/renesas/m16c/skp16c26/src/skp16c26.h
index 7410ec0cdb..f30c20c5a3 100644
--- a/boards/renesas/m32262f8/skp16c26/src/skp16c26.h
+++ b/boards/renesas/m16c/skp16c26/src/skp16c26.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/renesas/m32262f8/skp16c26/src/scp16c26.h
+ * boards/renesas/m16c/skp16c26/src/scp16c26.h
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/drivers/lcd/README.txt b/drivers/lcd/README.txt
index 28f8658fdf..021904ca83 100644
--- a/drivers/lcd/README.txt
+++ b/drivers/lcd/README.txt
@@ -233,7 +233,7 @@ interface) that makes then less re-usable:
Alphnumeric/segment LCD Displays:
- boards/renesas/m32262f8/skp16c26/src/m16c_lcd.c. Untested alphanumeric
+ boards/renesas/m16c/skp16c26/src/m16c_lcd.c. Untested alphanumeric
LCD driver.
boards/mips/pic32mx/sure-pic32mx/src/pic32_lcd1602.c. An LCD1602 segment
LCD. This is a bit-bang version of the driver and appears to