61 files changed, 63 insertions, 63 deletions
diff --git a/.gitmodules b/.gitmodules
index d21ed511e..bb62a5c39 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -98,6 +98,6 @@
 [submodule "ports/stm32f4/stm32f4"]
 	path = ports/stm32f4/stm32f4
 	url = https://github.com/adafruit/stm32f4.git
-[submodule "ports/spresense/spresense-exported-sdk"]
-	path = ports/spresense/spresense-exported-sdk
+[submodule "ports/cxd56/spresense-exported-sdk"]
+	path = ports/cxd56/spresense-exported-sdk
 	url = https://github.com/sonydevworld/spresense-exported-sdk.git
diff --git a/conf.py b/conf.py
index df6e6ab60..a477016dc 100644
--- a/conf.py
+++ b/conf.py
@@ -125,6 +125,7 @@ exclude_patterns = ["**/build*",
                     "ports/cc3200",
                     "ports/cc3200/FreeRTOS",
                     "ports/cc3200/hal",
+                    "ports/cxd56/spresense-exported-sdk",
                     "ports/esp32",
                     "ports/esp8266/boards",
                     "ports/esp8266/common-hal",
@@ -142,7 +143,6 @@ exclude_patterns = ["**/build*",
                     "ports/stm32f4/README.md",
                     "ports/pic16bit",
                     "ports/qemu-arm",
-                    "ports/spresense/spresense-exported-sdk",
                     "ports/stm32",
                     "ports/stm32/hal",
                     "ports/stm32/cmsis",
diff --git a/docs/supported_ports.rst b/docs/supported_ports.rst
index c256315f7..e221d8665 100644
--- a/docs/supported_ports.rst
+++ b/docs/supported_ports.rst
@@ -10,4 +10,4 @@ and ESP8266.
     ../ports/atmel-samd/README
     ../ports/esp8266/README
     ../ports/nrf/README
-    ../ports/spresense/README
+    ../ports/cxd56/README
diff --git a/ports/spresense/Makefile b/ports/cxd56/Makefile
index d8f809635..d8f809635 100644
--- a/ports/spresense/Makefile
+++ b/ports/cxd56/Makefile
diff --git a/ports/spresense/README.md b/ports/cxd56/README.md
index af4a6dea1..d66ea40b4 100644
--- a/ports/spresense/README.md
+++ b/ports/cxd56/README.md
@@ -33,9 +33,9 @@ Build the MicroPython cross-compiler:
 
     $ make -C mpy-cross
 
-Change directory to spresense:
+Change directory to cxd56:
 
-    $ cd ports/spresense
+    $ cd ports/cxd56
 
 To build circuitpython image run:
 
diff --git a/ports/spresense/alloca.h b/ports/cxd56/alloca.h
index aad2f8b5b..aad2f8b5b 100644
--- a/ports/spresense/alloca.h
+++ b/ports/cxd56/alloca.h
diff --git a/ports/spresense/background.c b/ports/cxd56/background.c
index ade257dd2..ade257dd2 100644
--- a/ports/spresense/background.c
+++ b/ports/cxd56/background.c
diff --git a/ports/spresense/background.h b/ports/cxd56/background.h
index 39e7c4fc8..a38e3faed 100644
--- a/ports/spresense/background.h
+++ b/ports/cxd56/background.h
@@ -24,10 +24,10 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_BACKGROUND_H
-#define MICROPY_INCLUDED_SPRESENSE_BACKGROUND_H
+#ifndef MICROPY_INCLUDED_CXD56_BACKGROUND_H
+#define MICROPY_INCLUDED_CXD56_BACKGROUND_H
 
 void background_tasks_reset(void);
 void run_background_tasks(void);
 
-#endif  // MICROPY_INCLUDED_SPRESENSE_BACKGROUND_H
+#endif  // MICROPY_INCLUDED_CXD56_BACKGROUND_H
diff --git a/ports/spresense/common-hal/analogio/AnalogIn.c b/ports/cxd56/common-hal/analogio/AnalogIn.c
index 438fbbcae..438fbbcae 100644
--- a/ports/spresense/common-hal/analogio/AnalogIn.c
+++ b/ports/cxd56/common-hal/analogio/AnalogIn.c
diff --git a/ports/spresense/common-hal/analogio/AnalogIn.h b/ports/cxd56/common-hal/analogio/AnalogIn.h
index 7fc197f98..4e8b41e52 100644
--- a/ports/spresense/common-hal/analogio/AnalogIn.h
+++ b/ports/cxd56/common-hal/analogio/AnalogIn.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_ANALOGIO_ANALOGIN_H
-#define MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_ANALOGIO_ANALOGIN_H
+#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_ANALOGIO_ANALOGIN_H
+#define MICROPY_INCLUDED_CXD56_COMMON_HAL_ANALOGIO_ANALOGIN_H
 
 #include "py/obj.h"
 
@@ -39,4 +39,4 @@ typedef struct {
 
 void analogin_reset(void);
 
-#endif // MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_ANALOGIO_ANALOGIN_H
+#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_ANALOGIO_ANALOGIN_H
diff --git a/ports/spresense/common-hal/analogio/AnalogOut.c b/ports/cxd56/common-hal/analogio/AnalogOut.c
index 3f1abe80d..3f1abe80d 100644
--- a/ports/spresense/common-hal/analogio/AnalogOut.c
+++ b/ports/cxd56/common-hal/analogio/AnalogOut.c
diff --git a/ports/spresense/common-hal/analogio/AnalogOut.h b/ports/cxd56/common-hal/analogio/AnalogOut.h
index 60d3cf0a1..b0fd65265 100644
--- a/ports/spresense/common-hal/analogio/AnalogOut.h
+++ b/ports/cxd56/common-hal/analogio/AnalogOut.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_ANALOGIO_ANALOGOUT_H
-#define MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_ANALOGIO_ANALOGOUT_H
+#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_ANALOGIO_ANALOGOUT_H
+#define MICROPY_INCLUDED_CXD56_COMMON_HAL_ANALOGIO_ANALOGOUT_H
 
 #include "py/obj.h"
 
@@ -33,4 +33,4 @@ typedef struct {
     mp_obj_base_t base;
 } analogio_analogout_obj_t;
 
-#endif // MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_ANALOGIO_ANALOGOUT_H
+#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_ANALOGIO_ANALOGOUT_H
diff --git a/ports/spresense/common-hal/analogio/__init__.c b/ports/cxd56/common-hal/analogio/__init__.c
index eea58c77d..eea58c77d 100644
--- a/ports/spresense/common-hal/analogio/__init__.c
+++ b/ports/cxd56/common-hal/analogio/__init__.c
diff --git a/ports/spresense/common-hal/board/__init__.c b/ports/cxd56/common-hal/board/__init__.c
index d123969fe..d123969fe 100644
--- a/ports/spresense/common-hal/board/__init__.c
+++ b/ports/cxd56/common-hal/board/__init__.c
diff --git a/ports/spresense/common-hal/busio/I2C.c b/ports/cxd56/common-hal/busio/I2C.c
index c163c183a..c163c183a 100644
--- a/ports/spresense/common-hal/busio/I2C.c
+++ b/ports/cxd56/common-hal/busio/I2C.c
diff --git a/ports/spresense/common-hal/busio/I2C.h b/ports/cxd56/common-hal/busio/I2C.h
index ec2acfb53..cdef270bf 100644
--- a/ports/spresense/common-hal/busio/I2C.h
+++ b/ports/cxd56/common-hal/busio/I2C.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_BUSIO_I2C_H
-#define MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_BUSIO_I2C_H
+#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_BUSIO_I2C_H
+#define MICROPY_INCLUDED_CXD56_COMMON_HAL_BUSIO_I2C_H
 
 #include "py/obj.h"
 
@@ -40,4 +40,4 @@ typedef struct {
     const mcu_pin_obj_t *sda_pin;
 } busio_i2c_obj_t;
 
-#endif // MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_BUSIO_I2C_H
+#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_BUSIO_I2C_H
diff --git a/ports/spresense/common-hal/busio/OneWire.h b/ports/cxd56/common-hal/busio/OneWire.h
index a76ee8c77..17c1b2237 100644
--- a/ports/spresense/common-hal/busio/OneWire.h
+++ b/ports/cxd56/common-hal/busio/OneWire.h
@@ -24,10 +24,10 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_BUSIO_ONEWIRE_H
-#define MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_BUSIO_ONEWIRE_H
+#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_BUSIO_ONEWIRE_H
+#define MICROPY_INCLUDED_CXD56_COMMON_HAL_BUSIO_ONEWIRE_H
 
 // Use bitbangio.
 #include "shared-module/busio/OneWire.h"
 
-#endif // MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_BUSIO_ONEWIRE_H
+#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_BUSIO_ONEWIRE_H
diff --git a/ports/spresense/common-hal/busio/SPI.c b/ports/cxd56/common-hal/busio/SPI.c
index 9a41011f2..9a41011f2 100644
--- a/ports/spresense/common-hal/busio/SPI.c
+++ b/ports/cxd56/common-hal/busio/SPI.c
diff --git a/ports/spresense/common-hal/busio/SPI.h b/ports/cxd56/common-hal/busio/SPI.h
index 90c2f6b81..8985a60d9 100644
--- a/ports/spresense/common-hal/busio/SPI.h
+++ b/ports/cxd56/common-hal/busio/SPI.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_BUSIO_SPI_H
-#define MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_BUSIO_SPI_H
+#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_BUSIO_SPI_H
+#define MICROPY_INCLUDED_CXD56_COMMON_HAL_BUSIO_SPI_H
 
 #include <nuttx/spi/spi.h>
 
@@ -46,4 +46,4 @@ typedef struct {
     const mcu_pin_obj_t *miso_pin;
 } busio_spi_obj_t;
 
-#endif // MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_BUSIO_SPI_H
+#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_BUSIO_SPI_H
diff --git a/ports/spresense/common-hal/busio/UART.c b/ports/cxd56/common-hal/busio/UART.c
index 2389cbf96..2389cbf96 100644
--- a/ports/spresense/common-hal/busio/UART.c
+++ b/ports/cxd56/common-hal/busio/UART.c
diff --git a/ports/spresense/common-hal/busio/UART.h b/ports/cxd56/common-hal/busio/UART.h
index 7cdbe4ff3..1c01cfbb9 100644
--- a/ports/spresense/common-hal/busio/UART.h
+++ b/ports/cxd56/common-hal/busio/UART.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_BUSIO_UART_H
-#define MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_BUSIO_UART_H
+#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_BUSIO_UART_H
+#define MICROPY_INCLUDED_CXD56_COMMON_HAL_BUSIO_UART_H
 
 #include "py/obj.h"
 
@@ -40,4 +40,4 @@ typedef struct {
     uint32_t timeout;
 } busio_uart_obj_t;
 
-#endif // MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_BUSIO_UART_H
+#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_BUSIO_UART_H
diff --git a/ports/spresense/common-hal/busio/__init__.c b/ports/cxd56/common-hal/busio/__init__.c
index 41761b674..41761b674 100644
--- a/ports/spresense/common-hal/busio/__init__.c
+++ b/ports/cxd56/common-hal/busio/__init__.c
diff --git a/ports/spresense/common-hal/digitalio/DigitalInOut.c b/ports/cxd56/common-hal/digitalio/DigitalInOut.c
index 7b1f6cc03..7b1f6cc03 100644
--- a/ports/spresense/common-hal/digitalio/DigitalInOut.c
+++ b/ports/cxd56/common-hal/digitalio/DigitalInOut.c
diff --git a/ports/spresense/common-hal/digitalio/DigitalInOut.h b/ports/cxd56/common-hal/digitalio/DigitalInOut.h
index a5bfd22bd..58a11817c 100644
--- a/ports/spresense/common-hal/digitalio/DigitalInOut.h
+++ b/ports/cxd56/common-hal/digitalio/DigitalInOut.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
-#define MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
+#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
+#define MICROPY_INCLUDED_CXD56_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
 
 #include "py/obj.h"
 
@@ -39,4 +39,4 @@ typedef struct {
     uint8_t pull;
 } digitalio_digitalinout_obj_t;
 
-#endif // MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
+#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_DIGITALIO_DIGITALINOUT_H
diff --git a/ports/spresense/common-hal/digitalio/__init__.c b/ports/cxd56/common-hal/digitalio/__init__.c
index 20fad4595..20fad4595 100644
--- a/ports/spresense/common-hal/digitalio/__init__.c
+++ b/ports/cxd56/common-hal/digitalio/__init__.c
diff --git a/ports/spresense/common-hal/microcontroller/Pin.c b/ports/cxd56/common-hal/microcontroller/Pin.c
index 005defa84..005defa84 100644
--- a/ports/spresense/common-hal/microcontroller/Pin.c
+++ b/ports/cxd56/common-hal/microcontroller/Pin.c
diff --git a/ports/spresense/common-hal/microcontroller/Pin.h b/ports/cxd56/common-hal/microcontroller/Pin.h
index 2d995d0dd..113387cef 100644
--- a/ports/spresense/common-hal/microcontroller/Pin.h
+++ b/ports/cxd56/common-hal/microcontroller/Pin.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_MICROCONTROLLER_PIN_H
-#define MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_MICROCONTROLLER_PIN_H
+#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_MICROCONTROLLER_PIN_H
+#define MICROPY_INCLUDED_CXD56_COMMON_HAL_MICROCONTROLLER_PIN_H
 
 #include "py/obj.h"
 
@@ -89,4 +89,4 @@ void reset_pin_number(uint8_t pin_number);
 void reset_all_pins(void);
 void claim_pin(const mcu_pin_obj_t* pin);
 
-#endif // MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_MICROCONTROLLER_PIN_H
+#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_MICROCONTROLLER_PIN_H
diff --git a/ports/spresense/common-hal/microcontroller/Processor.c b/ports/cxd56/common-hal/microcontroller/Processor.c
index 355ee01df..355ee01df 100644
--- a/ports/spresense/common-hal/microcontroller/Processor.c
+++ b/ports/cxd56/common-hal/microcontroller/Processor.c
diff --git a/ports/spresense/common-hal/microcontroller/Processor.h b/ports/cxd56/common-hal/microcontroller/Processor.h
index 6c4c17b03..12555e82c 100644
--- a/ports/spresense/common-hal/microcontroller/Processor.h
+++ b/ports/cxd56/common-hal/microcontroller/Processor.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H
-#define MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H
+#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H
+#define MICROPY_INCLUDED_CXD56_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H
 
 #define COMMON_HAL_MCU_PROCESSOR_UID_LENGTH CONFIG_BOARDCTL_UNIQUEID_SIZE
 
@@ -37,4 +37,4 @@ typedef struct {
 
 const mp_obj_type_t mcu_processor_type;
 
-#endif // MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H
+#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_MICROCONTROLLER_PROCESSOR_H
diff --git a/ports/spresense/common-hal/microcontroller/__init__.c b/ports/cxd56/common-hal/microcontroller/__init__.c
index 576896eb2..576896eb2 100644
--- a/ports/spresense/common-hal/microcontroller/__init__.c
+++ b/ports/cxd56/common-hal/microcontroller/__init__.c
diff --git a/ports/spresense/common-hal/os/__init__.c b/ports/cxd56/common-hal/os/__init__.c
index d4b0e23be..d4b0e23be 100644
--- a/ports/spresense/common-hal/os/__init__.c
+++ b/ports/cxd56/common-hal/os/__init__.c
diff --git a/ports/spresense/common-hal/pulseio/PWMOut.c b/ports/cxd56/common-hal/pulseio/PWMOut.c
index fae49aed3..fae49aed3 100644
--- a/ports/spresense/common-hal/pulseio/PWMOut.c
+++ b/ports/cxd56/common-hal/pulseio/PWMOut.c
diff --git a/ports/spresense/common-hal/pulseio/PWMOut.h b/ports/cxd56/common-hal/pulseio/PWMOut.h
index 486d5add9..c16084fe6 100644
--- a/ports/spresense/common-hal/pulseio/PWMOut.h
+++ b/ports/cxd56/common-hal/pulseio/PWMOut.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_PULSEIO_PWMOUT_H
-#define MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_PULSEIO_PWMOUT_H
+#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_PULSEIO_PWMOUT_H
+#define MICROPY_INCLUDED_CXD56_COMMON_HAL_PULSEIO_PWMOUT_H
 
 #include <nuttx/drivers/pwm.h>
 
@@ -45,4 +45,4 @@ void pwmout_reset(void);
 void pwmout_start(uint8_t pwm_num);
 void pwmout_stop(uint8_t pwm_num);
 
-#endif // MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_PULSEIO_PWMOUT_H
+#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_PULSEIO_PWMOUT_H
diff --git a/ports/spresense/common-hal/pulseio/PulseIn.c b/ports/cxd56/common-hal/pulseio/PulseIn.c
index dd2773d1d..dd2773d1d 100644
--- a/ports/spresense/common-hal/pulseio/PulseIn.c
+++ b/ports/cxd56/common-hal/pulseio/PulseIn.c
diff --git a/ports/spresense/common-hal/pulseio/PulseIn.h b/ports/cxd56/common-hal/pulseio/PulseIn.h
index 5f2f31811..ff31712ab 100644
--- a/ports/spresense/common-hal/pulseio/PulseIn.h
+++ b/ports/cxd56/common-hal/pulseio/PulseIn.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_PULSEIO_PULSEIN_H
-#define MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_PULSEIO_PULSEIN_H
+#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_PULSEIO_PULSEIN_H
+#define MICROPY_INCLUDED_CXD56_COMMON_HAL_PULSEIO_PULSEIN_H
 
 #include "common-hal/microcontroller/Pin.h"
 
@@ -44,4 +44,4 @@ typedef struct {
     bool paused;
 } pulseio_pulsein_obj_t;
 
-#endif // MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_PULSEIO_PULSEIN_H
+#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_PULSEIO_PULSEIN_H
diff --git a/ports/spresense/common-hal/pulseio/PulseOut.c b/ports/cxd56/common-hal/pulseio/PulseOut.c
index 5e1d5a2ed..5e1d5a2ed 100644
--- a/ports/spresense/common-hal/pulseio/PulseOut.c
+++ b/ports/cxd56/common-hal/pulseio/PulseOut.c
diff --git a/ports/spresense/common-hal/pulseio/PulseOut.h b/ports/cxd56/common-hal/pulseio/PulseOut.h
index 652a1197e..61bc17527 100644
--- a/ports/spresense/common-hal/pulseio/PulseOut.h
+++ b/ports/cxd56/common-hal/pulseio/PulseOut.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_PULSEIO_PULSEOUT_H
-#define MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_PULSEIO_PULSEOUT_H
+#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_PULSEIO_PULSEOUT_H
+#define MICROPY_INCLUDED_CXD56_COMMON_HAL_PULSEIO_PULSEOUT_H
 
 #include "py/obj.h"
 
@@ -36,4 +36,4 @@ typedef struct {
 
 void pulseout_reset(void);
 
-#endif // MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_PULSEIO_PULSEOUT_H
+#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_PULSEIO_PULSEOUT_H
diff --git a/ports/spresense/common-hal/pulseio/__init__.c b/ports/cxd56/common-hal/pulseio/__init__.c
index 2bee925bc..2bee925bc 100644
--- a/ports/spresense/common-hal/pulseio/__init__.c
+++ b/ports/cxd56/common-hal/pulseio/__init__.c
diff --git a/ports/spresense/common-hal/rtc/RTC.c b/ports/cxd56/common-hal/rtc/RTC.c
index ce65e6acd..ce65e6acd 100644
--- a/ports/spresense/common-hal/rtc/RTC.c
+++ b/ports/cxd56/common-hal/rtc/RTC.c
diff --git a/ports/spresense/common-hal/rtc/RTC.h b/ports/cxd56/common-hal/rtc/RTC.h
index 7a3ef18bd..5647fdcf1 100644
--- a/ports/spresense/common-hal/rtc/RTC.h
+++ b/ports/cxd56/common-hal/rtc/RTC.h
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_RTC_RTC_H
-#define MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_RTC_RTC_H
+#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_RTC_RTC_H
+#define MICROPY_INCLUDED_CXD56_COMMON_HAL_RTC_RTC_H
 
-#endif  // MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_RTC_RTC_H
+#endif  // MICROPY_INCLUDED_CXD56_COMMON_HAL_RTC_RTC_H
diff --git a/ports/spresense/common-hal/rtc/__init__.c b/ports/cxd56/common-hal/rtc/__init__.c
index 92d25d563..92d25d563 100644
--- a/ports/spresense/common-hal/rtc/__init__.c
+++ b/ports/cxd56/common-hal/rtc/__init__.c
diff --git a/ports/spresense/common-hal/supervisor/Runtime.c b/ports/cxd56/common-hal/supervisor/Runtime.c
index a0d9e70ab..a0d9e70ab 100755
--- a/ports/spresense/common-hal/supervisor/Runtime.c
+++ b/ports/cxd56/common-hal/supervisor/Runtime.c
diff --git a/ports/spresense/common-hal/supervisor/Runtime.h b/ports/cxd56/common-hal/supervisor/Runtime.h
index c3ed62a25..f4669c6ab 100755
--- a/ports/spresense/common-hal/supervisor/Runtime.h
+++ b/ports/cxd56/common-hal/supervisor/Runtime.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_SUPERVISOR_RUNTIME_H
-#define MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_SUPERVISOR_RUNTIME_H
+#ifndef MICROPY_INCLUDED_CXD56_COMMON_HAL_SUPERVISOR_RUNTIME_H
+#define MICROPY_INCLUDED_CXD56_COMMON_HAL_SUPERVISOR_RUNTIME_H
 
 #include "py/obj.h"
 
@@ -33,4 +33,4 @@ typedef struct {
     mp_obj_base_t base;
 } super_runtime_obj_t;
 
-#endif // MICROPY_INCLUDED_SPRESENSE_COMMON_HAL_SUPERVISOR_RUNTIME_H
+#endif // MICROPY_INCLUDED_CXD56_COMMON_HAL_SUPERVISOR_RUNTIME_H
diff --git a/ports/spresense/common-hal/supervisor/__init__.c b/ports/cxd56/common-hal/supervisor/__init__.c
index e240525f2..e240525f2 100755
--- a/ports/spresense/common-hal/supervisor/__init__.c
+++ b/ports/cxd56/common-hal/supervisor/__init__.c
diff --git a/ports/spresense/common-hal/time/__init__.c b/ports/cxd56/common-hal/time/__init__.c
index 8f7326b62..8f7326b62 100644
--- a/ports/spresense/common-hal/time/__init__.c
+++ b/ports/cxd56/common-hal/time/__init__.c
diff --git a/ports/spresense/fatfs_port.c b/ports/cxd56/fatfs_port.c
index e986b4c6e..e986b4c6e 100644
--- a/ports/spresense/fatfs_port.c
+++ b/ports/cxd56/fatfs_port.c
diff --git a/ports/spresense/mpconfigboard.h b/ports/cxd56/mpconfigboard.h
index e0fef60f0..e0fef60f0 100644
--- a/ports/spresense/mpconfigboard.h
+++ b/ports/cxd56/mpconfigboard.h
diff --git a/ports/spresense/mpconfigport.h b/ports/cxd56/mpconfigport.h
index 233b7b9a7..233b7b9a7 100644
--- a/ports/spresense/mpconfigport.h
+++ b/ports/cxd56/mpconfigport.h
diff --git a/ports/spresense/mpconfigport.mk b/ports/cxd56/mpconfigport.mk
index 53dba2840..53dba2840 100644
--- a/ports/spresense/mpconfigport.mk
+++ b/ports/cxd56/mpconfigport.mk
diff --git a/ports/spresense/mphalport.c b/ports/cxd56/mphalport.c
index 79d93f975..79d93f975 100644
--- a/ports/spresense/mphalport.c
+++ b/ports/cxd56/mphalport.c
diff --git a/ports/spresense/mphalport.h b/ports/cxd56/mphalport.h
index 8b397d41e..25bca97ad 100644
--- a/ports/spresense/mphalport.h
+++ b/ports/cxd56/mphalport.h
@@ -24,8 +24,8 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_MPHALPORT_H
-#define MICROPY_INCLUDED_SPRESENSE_MPHALPORT_H
+#ifndef MICROPY_INCLUDED_CXD56_MPHALPORT_H
+#define MICROPY_INCLUDED_CXD56_MPHALPORT_H
 
 #include <sys/types.h>
 
@@ -33,4 +33,4 @@
 
 extern volatile uint64_t ticks_ms;
 
-#endif // MICROPY_INCLUDED_SPRESENSE_MPHALPORT_H
+#endif // MICROPY_INCLUDED_CXD56_MPHALPORT_H
diff --git a/ports/spresense/qstrdefsport.h b/ports/cxd56/qstrdefsport.h
index 3ba897069..3ba897069 100644
--- a/ports/spresense/qstrdefsport.h
+++ b/ports/cxd56/qstrdefsport.h
diff --git a/ports/spresense/spresense-exported-sdk b/ports/cxd56/spresense-exported-sdk
-Subproject b473b28a14a03f3d416b6e2c071bcfd4fb92cb6
+Subproject b473b28a14a03f3d416b6e2c071bcfd4fb92cb6
diff --git a/ports/spresense/supervisor/cpu.s b/ports/cxd56/supervisor/cpu.s
index 9e6807a5e..9e6807a5e 100755
--- a/ports/spresense/supervisor/cpu.s
+++ b/ports/cxd56/supervisor/cpu.s
diff --git a/ports/spresense/supervisor/internal_flash.c b/ports/cxd56/supervisor/internal_flash.c
index 0c9a61e06..0c9a61e06 100644
--- a/ports/spresense/supervisor/internal_flash.c
+++ b/ports/cxd56/supervisor/internal_flash.c
diff --git a/ports/spresense/supervisor/internal_flash.h b/ports/cxd56/supervisor/internal_flash.h
index bc4e98baf..1580ad3e1 100644
--- a/ports/spresense/supervisor/internal_flash.h
+++ b/ports/cxd56/supervisor/internal_flash.h
@@ -24,7 +24,7 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_INTERNAL_FLASH_H
-#define MICROPY_INCLUDED_SPRESENSE_INTERNAL_FLASH_H
+#ifndef MICROPY_INCLUDED_CXD56_INTERNAL_FLASH_H
+#define MICROPY_INCLUDED_CXD56_INTERNAL_FLASH_H
 
-#endif  // MICROPY_INCLUDED_SPRESENSE_INTERNAL_FLASH_H
+#endif  // MICROPY_INCLUDED_CXD56_INTERNAL_FLASH_H
diff --git a/ports/spresense/supervisor/internal_flash_root_pointers.h b/ports/cxd56/supervisor/internal_flash_root_pointers.h
index 87f478d13..126c6af09 100644
--- a/ports/spresense/supervisor/internal_flash_root_pointers.h
+++ b/ports/cxd56/supervisor/internal_flash_root_pointers.h
@@ -23,9 +23,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_SPRESENSE_INTERNAL_FLASH_ROOT_POINTERS_H
-#define MICROPY_INCLUDED_SPRESENSE_INTERNAL_FLASH_ROOT_POINTERS_H
+#ifndef MICROPY_INCLUDED_CXD56_INTERNAL_FLASH_ROOT_POINTERS_H
+#define MICROPY_INCLUDED_CXD56_INTERNAL_FLASH_ROOT_POINTERS_H
 
 #define FLASH_ROOT_POINTERS
 
-#endif  // MICROPY_INCLUDED_SPRESENSE_INTERNAL_FLASH_ROOT_POINTERS_H
+#endif  // MICROPY_INCLUDED_CXD56_INTERNAL_FLASH_ROOT_POINTERS_H
diff --git a/ports/spresense/supervisor/port.c b/ports/cxd56/supervisor/port.c
index ab1ea5273..ab1ea5273 100644
--- a/ports/spresense/supervisor/port.c
+++ b/ports/cxd56/supervisor/port.c
diff --git a/ports/spresense/supervisor/usb.c b/ports/cxd56/supervisor/usb.c
index 6ad253c6d..6ad253c6d 100644
--- a/ports/spresense/supervisor/usb.c
+++ b/ports/cxd56/supervisor/usb.c
diff --git a/ports/spresense/tick.c b/ports/cxd56/tick.c
index 6529db790..6529db790 100644
--- a/ports/spresense/tick.c
+++ b/ports/cxd56/tick.c
diff --git a/ports/spresense/tick.h b/ports/cxd56/tick.h
index 7c4d5725f..a0d9ee526 100644
--- a/ports/spresense/tick.h
+++ b/ports/cxd56/tick.h
@@ -24,11 +24,11 @@
  * THE SOFTWARE.
  */
 
-#ifndef MICROPY_INCLUDED_SPRESENSE_TICK_H
-#define MICROPY_INCLUDED_SPRESENSE_TICK_H
+#ifndef MICROPY_INCLUDED_CXD56_TICK_H
+#define MICROPY_INCLUDED_CXD56_TICK_H
 
 #include "py/mpconfig.h"
 
 extern volatile uint64_t ticks_ms;
 
-#endif  // MICROPY_INCLUDED_SPRESENSE_TICK_H
+#endif  // MICROPY_INCLUDED_CXD56_TICK_H