renesas-ra: Change MICROPY_HW_BOARD_NAME definition to product name.

Changes in this commit:
- Change MICROPY_HW_BOARD_NAME definition to match the product name.
- Rename board folder's name to match the product name style.
- Change related files like Makefile, document descriptions, test cases, CI
  and tools.

Signed-off-by: Takeo Takahashi <takeo.takahashi.xv@renesas.com>

148 files changed, 62 insertions, 59 deletions

diff --git a/docs/renesas-ra/general.rst b/docs/renesas-ra/general.rst
index c8eea53f8b..59bc2ef206 100644
--- a/docs/renesas-ra/general.rst
+++ b/docs/renesas-ra/general.rst
@@ -18,7 +18,7 @@ The following boards are officially supported.
 
 * RA4M1-CLICKER
 
-For the manual and other references for the board and RA Family MCU, please refer to the web page: `EK-RA4M1 CLICKER <https://www.mikroe.com/ra4m1-clicker>`_
+For the manual and other references for the board and RA Family MCU, please refer to the web page: `RA4M1 CLICKER <https://www.mikroe.com/ra4m1-clicker>`_
 
 * EK-RA6M2
 
diff --git a/docs/renesas-ra/tutorial/intro.rst b/docs/renesas-ra/tutorial/intro.rst
index 6c41f43971..6003e71575 100644
--- a/docs/renesas-ra/tutorial/intro.rst
+++ b/docs/renesas-ra/tutorial/intro.rst
@@ -62,6 +62,6 @@ Access the MicroPython REPL (the Python prompt) via USB serial or UART with 1152
 
 You can see the MicroPython REPL prompt like below::
 
-   MicroPython v1.18-293-g339aa09b8-dirty on 2022-03-26; RA6M2_EK with RA6M2
+   MicroPython v1.20.0 on 2023-04-27; EK-RA6M2 with RA6M2
    Type "help()" for more information.
    >>>
diff --git a/ports/renesas-ra/Makefile b/ports/renesas-ra/Makefile
index dc4b158483..f0b1e1ed75 100644
--- a/ports/renesas-ra/Makefile
+++ b/ports/renesas-ra/Makefile
@@ -5,7 +5,7 @@ ifdef BOARD_DIR
 BOARD ?= $(notdir $(BOARD_DIR:/=))
 else
 # If not given on the command line, then default to RA6M2_EK.
-BOARD ?= RA6M2_EK
+BOARD ?= EK_RA6M2
 BOARD_DIR ?= boards/$(BOARD)
 endif
 
@@ -23,28 +23,28 @@ CMSIS_MCU_CAP = RA4M1
 USE_FSP_LPM = 0
 endif
 
-ifeq ($(BOARD),RA4M1_EK)
+ifeq ($(BOARD),EK_RA4M1)
 BOARD_LOW = ra4m1_ek
 CMSIS_MCU_LOW = ra4m1
 CMSIS_MCU_CAP = RA4M1
 USE_FSP_LPM = 0
 endif
 
-ifeq ($(BOARD),RA4W1_EK)
+ifeq ($(BOARD),EK_RA4W1)
 BOARD_LOW = ra4w1_ek
 CMSIS_MCU_LOW = ra4w1
 CMSIS_MCU_CAP = RA4W1
 USE_FSP_LPM = 1
 endif
 
-ifeq ($(BOARD),RA6M1_EK)
+ifeq ($(BOARD),EK_RA6M1)
 BOARD_LOW = ra6m1_ek
 CMSIS_MCU_LOW = ra6m1
 CMSIS_MCU_CAP = RA6M1
 USE_FSP_LPM = 1
 endif
 
-ifeq ($(BOARD),RA6M2_EK)
+ifeq ($(BOARD),EK_RA6M2)
 BOARD_LOW = ra6m2_ek
 CMSIS_MCU_LOW = ra6m2
 CMSIS_MCU_CAP = RA6M2
diff --git a/ports/renesas-ra/README.md b/ports/renesas-ra/README.md
index c75a9e13d1..896d465d2d 100644
--- a/ports/renesas-ra/README.md
+++ b/ports/renesas-ra/README.md
@@ -48,15 +48,15 @@ First the submodules must be obtained using:
 * Build binary image `.hex`
 Then to build for a given board subdirectory name, run:
 
-      $ make BOARD=RA6M2_EK clean
-      $ make BOARD=RA6M2_EK
+      $ make BOARD=EK_RA6M2 clean
+      $ make BOARD=EK_RA6M2
 
-  The default board subdirectory name is RA6M2_EK (which is for EK-RA6M2 board)
+  The default board subdirectory name is EK_RA6M2 (which is for EK-RA6M2 board)
 but any of the names of the subdirectories in the `boards/` directory can be
-passed as the argument to `BOARD=`; for example `RA4M1_CLICKER`, `RA4M1_EK`,
-`RA4W1_EK` and `RA6M1_EK`.
+passed as the argument to `BOARD=`; for example `RA4M1_CLICKER`, `EK_RA4M1`,
+`EK_RA4W1` and `EK_RA6M1`.
 The above command should produce binary images `firmware.hex` in the
-build-RA6M2_EK/` subdirectory (or the equivalent directory for the board specified).
+build-EK_RA6M2/` subdirectory (or the equivalent directory for the board specified).
 
 ## Supported/Unsupprted funtions
 Please refer to the `renesas-ra` quick reference.
diff --git a/ports/renesas-ra/boards/RA4M1_EK/board.json b/ports/renesas-ra/boards/EK_RA4M1/board.json
index bab3bcacee..bab3bcacee 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/board.json
+++ b/ports/renesas-ra/boards/EK_RA4M1/board.json
diff --git a/ports/renesas-ra/boards/RA4M1_EK/manifest.py b/ports/renesas-ra/boards/EK_RA4M1/manifest.py
index 99b9c94051..99b9c94051 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/manifest.py
+++ b/ports/renesas-ra/boards/EK_RA4M1/manifest.py
diff --git a/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h
index 2874142890..cd699e51bd 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.h
@@ -1,5 +1,5 @@
 // MCU config
-#define MICROPY_HW_BOARD_NAME       "RA4M1_EK"
+#define MICROPY_HW_BOARD_NAME       "EK-RA4M1"
 #define MICROPY_HW_MCU_NAME         "RA4M1"
 #define MICROPY_HW_MCU_SYSCLK       48000000
 #define MICROPY_HW_MCU_PCLK         48000000
diff --git a/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.mk b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.mk
index 1213fa3229..abc111d16e 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/mpconfigboard.mk
+++ b/ports/renesas-ra/boards/EK_RA4M1/mpconfigboard.mk
@@ -1,9 +1,9 @@
 CMSIS_MCU = RA4M1
 MCU_SERIES = m4
-LD_FILES = boards/RA4M1_EK/ra4m1_ek.ld
+LD_FILES = boards/EK_RA4M1/ra4m1_ek.ld
 
 # MicroPython settings
 MICROPY_VFS_FAT = 1
 
 # Don't include default frozen modules because MCU is tight on flash space
-FROZEN_MANIFEST ?= boards/RA4M1_EK/manifest.py
+FROZEN_MANIFEST ?= boards/EK_RA4M1/manifest.py
diff --git a/ports/renesas-ra/boards/RA4M1_EK/pins.csv b/ports/renesas-ra/boards/EK_RA4M1/pins.csv
index 910321b966..910321b966 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/pins.csv
+++ b/ports/renesas-ra/boards/EK_RA4M1/pins.csv
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek.ld b/ports/renesas-ra/boards/EK_RA4M1/ra4m1_ek.ld
index 52f8acf93e..52f8acf93e 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek.ld
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra4m1_ek.ld
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek_conf.h b/ports/renesas-ra/boards/EK_RA4M1/ra4m1_ek_conf.h
index 261073cfe9..261073cfe9 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra4m1_ek_conf.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra4m1_ek_conf.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/bsp/board_cfg.h
index 4fab9f48c3..4fab9f48c3 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/bsp/board_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
index 9940d7ed3b..9940d7ed3b 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
index 444d32e560..444d32e560 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
index f52adbafae..f52adbafae 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
index 4766823b35..4766823b35 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_adc_cfg.h
index 9c59889ca8..9c59889ca8 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_adc_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_agt_cfg.h
index d3ab559238..d3ab559238 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_agt_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_dtc_cfg.h
index 21405f9674..21405f9674 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_dtc_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_flash_lp_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
index 26879f9f4e..26879f9f4e 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_icu_cfg.h
index 5e77b6980f..5e77b6980f 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_icu_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_ioport_cfg.h
index 6b4353d238..6b4353d238 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_ioport_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_lpm_cfg.h
index 5f4d5c4a73..5f4d5c4a73 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_lpm_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_rtc_cfg.h
index 484b7ed044..484b7ed044 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_rtc_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
index c70c0be344..c70c0be344 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_spi_cfg.h
index 861fe12194..861fe12194 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_cfg/fsp_cfg/r_spi_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/RA4M1-EK.csv b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/RA4M1-EK.csv
index a4118a6826..a4118a6826 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/RA4M1-EK.csv
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/RA4M1-EK.csv
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/bsp_clock_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/bsp_clock_cfg.h
index cf28c33d7a..cf28c33d7a 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/bsp_clock_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/bsp_clock_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/bsp_pin_cfg.h b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/bsp_pin_cfg.h
index 9aea535b5e..9aea535b5e 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/bsp_pin_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/bsp_pin_cfg.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/common_data.c b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/common_data.c
index 34aad762ff..34aad762ff 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/common_data.c
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/common_data.c
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/common_data.h b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/common_data.h
index e2eb70836b..e2eb70836b 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/common_data.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/common_data.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/hal_data.c b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/hal_data.c
index cfaa1abd0e..cfaa1abd0e 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/hal_data.c
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/hal_data.c
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/hal_data.h b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/hal_data.h
index 4120a48030..4120a48030 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/hal_data.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/hal_data.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/main.c b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/main.c
index 5b9f980559..5b9f980559 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/main.c
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/main.c
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/pin_data.c b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/pin_data.c
index bc928d63f5..bc928d63f5 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/pin_data.c
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/pin_data.c
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/vector_data.c b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/vector_data.c
index a5f0092a56..a5f0092a56 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/vector_data.c
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/vector_data.c
diff --git a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/vector_data.h b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/vector_data.h
index 1e23b674ca..1e23b674ca 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/ra_gen/vector_data.h
+++ b/ports/renesas-ra/boards/EK_RA4M1/ra_gen/vector_data.h
diff --git a/ports/renesas-ra/boards/RA4M1_EK/src/hal_entry.c b/ports/renesas-ra/boards/EK_RA4M1/src/hal_entry.c
index c922cfd17a..c922cfd17a 100644
--- a/ports/renesas-ra/boards/RA4M1_EK/src/hal_entry.c
+++ b/ports/renesas-ra/boards/EK_RA4M1/src/hal_entry.c
diff --git a/ports/renesas-ra/boards/RA4W1_EK/board.json b/ports/renesas-ra/boards/EK_RA4W1/board.json
index db06b6751d..db06b6751d 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/board.json
+++ b/ports/renesas-ra/boards/EK_RA4W1/board.json
diff --git a/ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h
index 0bf907a48c..5fd2d1c6a3 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.h
@@ -1,5 +1,5 @@
 // MCU config
-#define MICROPY_HW_BOARD_NAME       "RA4W1_EK"
+#define MICROPY_HW_BOARD_NAME       "EK-RA4W1"
 #define MICROPY_HW_MCU_NAME         "RA4W1"
 #define MICROPY_HW_MCU_SYSCLK       48000000
 #define MICROPY_HW_MCU_PCLK         48000000
diff --git a/ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.mk b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.mk
index a22e577fcb..c4f95f79f4 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/mpconfigboard.mk
+++ b/ports/renesas-ra/boards/EK_RA4W1/mpconfigboard.mk
@@ -1,6 +1,6 @@
 CMSIS_MCU = RA4W1
 MCU_SERIES = m4
-LD_FILES = boards/RA4W1_EK/ra4w1_ek.ld
+LD_FILES = boards/EK_RA4W1/ra4w1_ek.ld
 
 # MicroPython settings
 MICROPY_VFS_FAT = 1
diff --git a/ports/renesas-ra/boards/RA4W1_EK/pins.csv b/ports/renesas-ra/boards/EK_RA4W1/pins.csv
index 43afa52713..43afa52713 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/pins.csv
+++ b/ports/renesas-ra/boards/EK_RA4W1/pins.csv
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek.ld b/ports/renesas-ra/boards/EK_RA4W1/ra4w1_ek.ld
index 1241b5bc23..1241b5bc23 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek.ld
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra4w1_ek.ld
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek_conf.h b/ports/renesas-ra/boards/EK_RA4W1/ra4w1_ek_conf.h
index 261073cfe9..261073cfe9 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra4w1_ek_conf.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra4w1_ek_conf.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/bsp/board_cfg.h
index fd7b0ccb8f..fd7b0ccb8f 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/bsp/board_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
index 9ebcbf9777..9ebcbf9777 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
index 444d32e560..444d32e560 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
index 70984c8ef6..70984c8ef6 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
index fd26bb64e0..fd26bb64e0 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_adc_cfg.h
index 9c59889ca8..9c59889ca8 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_adc_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_agt_cfg.h
index d3ab559238..d3ab559238 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_agt_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_dtc_cfg.h
index 21405f9674..21405f9674 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_dtc_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_flash_lp_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
index 26879f9f4e..26879f9f4e 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_flash_lp_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_icu_cfg.h
index 5e77b6980f..5e77b6980f 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_icu_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_iic_master_cfg.h
index 595ea938d1..595ea938d1 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_iic_master_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_ioport_cfg.h
index 6b4353d238..6b4353d238 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_ioport_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_lpm_cfg.h
index 5f4d5c4a73..5f4d5c4a73 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_lpm_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_rtc_cfg.h
index 484b7ed044..484b7ed044 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_rtc_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
index c70c0be344..c70c0be344 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_spi_cfg.h
index 861fe12194..861fe12194 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_cfg/fsp_cfg/r_spi_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/RA4W1-EK.csv b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/RA4W1-EK.csv
index b686a5c0c9..b686a5c0c9 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/RA4W1-EK.csv
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/RA4W1-EK.csv
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/bsp_clock_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/bsp_clock_cfg.h
index 9432ad009c..9432ad009c 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/bsp_clock_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/bsp_clock_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/bsp_pin_cfg.h b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/bsp_pin_cfg.h
index 497c92d06e..497c92d06e 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/bsp_pin_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/bsp_pin_cfg.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/common_data.c b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/common_data.c
index 34aad762ff..34aad762ff 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/common_data.c
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/common_data.c
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/common_data.h b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/common_data.h
index e2eb70836b..e2eb70836b 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/common_data.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/common_data.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/hal_data.c b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/hal_data.c
index 8e7ee1bd4a..8e7ee1bd4a 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/hal_data.c
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/hal_data.c
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/hal_data.h b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/hal_data.h
index cf3f00771b..cf3f00771b 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/hal_data.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/hal_data.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/main.c b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/main.c
index 5b9f980559..5b9f980559 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/main.c
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/main.c
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/pin_data.c b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/pin_data.c
index 2a5a8764c5..2a5a8764c5 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/pin_data.c
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/pin_data.c
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/vector_data.c b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/vector_data.c
index 1867e73836..1867e73836 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/vector_data.c
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/vector_data.c
diff --git a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/vector_data.h b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/vector_data.h
index c45ef8d959..c45ef8d959 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/ra_gen/vector_data.h
+++ b/ports/renesas-ra/boards/EK_RA4W1/ra_gen/vector_data.h
diff --git a/ports/renesas-ra/boards/RA4W1_EK/src/hal_entry.c b/ports/renesas-ra/boards/EK_RA4W1/src/hal_entry.c
index 3e53787c61..3e53787c61 100644
--- a/ports/renesas-ra/boards/RA4W1_EK/src/hal_entry.c
+++ b/ports/renesas-ra/boards/EK_RA4W1/src/hal_entry.c
diff --git a/ports/renesas-ra/boards/RA6M1_EK/board.json b/ports/renesas-ra/boards/EK_RA6M1/board.json
index babcc5c166..babcc5c166 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/board.json
+++ b/ports/renesas-ra/boards/EK_RA6M1/board.json
diff --git a/ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h
index 59db4bc218..b6f76a062e 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.h
@@ -1,5 +1,5 @@
 // MCU config
-#define MICROPY_HW_BOARD_NAME       "RA6M1_EK"
+#define MICROPY_HW_BOARD_NAME       "EK-RA6M1"
 #define MICROPY_HW_MCU_NAME         "RA6M1"
 #define MICROPY_HW_MCU_SYSCLK       120000000
 #define MICROPY_HW_MCU_PCLK         60000000
diff --git a/ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.mk b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.mk
index 06f5f97bda..3f916eb8e3 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/mpconfigboard.mk
+++ b/ports/renesas-ra/boards/EK_RA6M1/mpconfigboard.mk
@@ -1,6 +1,6 @@
 CMSIS_MCU = RA6M1
 MCU_SERIES = m4
-LD_FILES = boards/RA6M1_EK/ra6m1_ek.ld
+LD_FILES = boards/EK_RA6M1/ra6m1_ek.ld
 
 # MicroPython settings
 MICROPY_VFS_FAT = 1
diff --git a/ports/renesas-ra/boards/RA6M1_EK/pins.csv b/ports/renesas-ra/boards/EK_RA6M1/pins.csv
index 6f685fa37c..6f685fa37c 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/pins.csv
+++ b/ports/renesas-ra/boards/EK_RA6M1/pins.csv
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld b/ports/renesas-ra/boards/EK_RA6M1/ra6m1_ek.ld
index c7d85ed3db..c7d85ed3db 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek.ld
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra6m1_ek.ld
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek_conf.h b/ports/renesas-ra/boards/EK_RA6M1/ra6m1_ek_conf.h
index 4ef32aefb2..4ef32aefb2 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra6m1_ek_conf.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra6m1_ek_conf.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/bsp/board_cfg.h
index f518a94aa7..f518a94aa7 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/bsp/board_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
index 54b41a45d4..54b41a45d4 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
index bd6a901c32..bd6a901c32 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
index 5fc7730d2d..5fc7730d2d 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
index 720eee2d7f..720eee2d7f 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_adc_cfg.h
index 9c59889ca8..9c59889ca8 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_adc_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_agt_cfg.h
index d3ab559238..d3ab559238 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_agt_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_dtc_cfg.h
index 21405f9674..21405f9674 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_dtc_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_flash_hp_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
index 48c9dec4e0..48c9dec4e0 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_icu_cfg.h
index 5e77b6980f..5e77b6980f 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_icu_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_iic_master_cfg.h
index 595ea938d1..595ea938d1 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_iic_master_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_ioport_cfg.h
index 6b4353d238..6b4353d238 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_ioport_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_lpm_cfg.h
index 5f4d5c4a73..5f4d5c4a73 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_lpm_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_rtc_cfg.h
index 484b7ed044..484b7ed044 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_rtc_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
index c70c0be344..c70c0be344 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_spi_cfg.h
index 861fe12194..861fe12194 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_cfg/fsp_cfg/r_spi_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/RA6M1-EK.csv b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/RA6M1-EK.csv
index 3e1b001163..3e1b001163 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/RA6M1-EK.csv
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/RA6M1-EK.csv
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/bsp_clock_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/bsp_clock_cfg.h
index 013621000b..013621000b 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/bsp_clock_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/bsp_clock_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/bsp_pin_cfg.h b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/bsp_pin_cfg.h
index cc0fd2fe77..cc0fd2fe77 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/bsp_pin_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/bsp_pin_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/common_data.c b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/common_data.c
index 34aad762ff..34aad762ff 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/common_data.c
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/common_data.c
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/common_data.h b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/common_data.h
index e2eb70836b..e2eb70836b 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/common_data.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/common_data.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/hal_data.c b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/hal_data.c
index 56f1735118..56f1735118 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/hal_data.c
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/hal_data.c
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/hal_data.h b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/hal_data.h
index d8773ab5ed..d8773ab5ed 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/hal_data.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/hal_data.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/main.c b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/main.c
index 5b9f980559..5b9f980559 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/main.c
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/main.c
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/pin_data.c b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/pin_data.c
index a2ddad010f..a2ddad010f 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/pin_data.c
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/pin_data.c
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/vector_data.c b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/vector_data.c
index cf17573a03..cf17573a03 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/vector_data.c
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/vector_data.c
diff --git a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/vector_data.h b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/vector_data.h
index b812cff2e1..b812cff2e1 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/ra_gen/vector_data.h
+++ b/ports/renesas-ra/boards/EK_RA6M1/ra_gen/vector_data.h
diff --git a/ports/renesas-ra/boards/RA6M1_EK/src/hal_entry.c b/ports/renesas-ra/boards/EK_RA6M1/src/hal_entry.c
index c922cfd17a..c922cfd17a 100644
--- a/ports/renesas-ra/boards/RA6M1_EK/src/hal_entry.c
+++ b/ports/renesas-ra/boards/EK_RA6M1/src/hal_entry.c
diff --git a/ports/renesas-ra/boards/RA6M2_EK/board.json b/ports/renesas-ra/boards/EK_RA6M2/board.json
index 63547d8807..63547d8807 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/board.json
+++ b/ports/renesas-ra/boards/EK_RA6M2/board.json
diff --git a/ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.h b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h
index 9988e0ed25..9e3c462eec 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.h
@@ -1,5 +1,5 @@
 // MCU config
-#define MICROPY_HW_BOARD_NAME       "RA6M2_EK"
+#define MICROPY_HW_BOARD_NAME       "EK-RA6M2"
 #define MICROPY_HW_MCU_NAME         "RA6M2"
 #define MICROPY_HW_MCU_SYSCLK       120000000
 #define MICROPY_HW_MCU_PCLK         60000000
diff --git a/ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.mk b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.mk
index 59d48c0e6c..a48ec6e50a 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/mpconfigboard.mk
+++ b/ports/renesas-ra/boards/EK_RA6M2/mpconfigboard.mk
@@ -1,6 +1,6 @@
 CMSIS_MCU = RA6M2
 MCU_SERIES = m4
-LD_FILES = boards/RA6M2_EK/ra6m2_ek.ld
+LD_FILES = boards/EK_RA6M2/ra6m2_ek.ld
 
 # MicroPython settings
 MICROPY_VFS_FAT = 1
diff --git a/ports/renesas-ra/boards/RA6M2_EK/pins.csv b/ports/renesas-ra/boards/EK_RA6M2/pins.csv
index 5986d72124..5986d72124 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/pins.csv
+++ b/ports/renesas-ra/boards/EK_RA6M2/pins.csv
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek.ld b/ports/renesas-ra/boards/EK_RA6M2/ra6m2_ek.ld
index 086f6630c1..086f6630c1 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek.ld
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra6m2_ek.ld
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek_conf.h b/ports/renesas-ra/boards/EK_RA6M2/ra6m2_ek_conf.h
index e34443e064..e34443e064 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra6m2_ek_conf.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra6m2_ek_conf.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/bsp/board_cfg.h
index ecffc5a448..ecffc5a448 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/board_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/bsp/board_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
index 7255cdd17c..7255cdd17c 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/bsp/bsp_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
index bd6a901c32..bd6a901c32 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
index 6097e9d7d3..6097e9d7d3 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/bsp/bsp_mcu_device_pn_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
index 51f399e3c9..51f399e3c9 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/bsp/bsp_mcu_family_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_adc_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_adc_cfg.h
index 9c59889ca8..9c59889ca8 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_adc_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_adc_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_agt_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_agt_cfg.h
index d3ab559238..d3ab559238 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_agt_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_agt_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_dtc_cfg.h
index 21405f9674..21405f9674 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_dtc_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_dtc_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_flash_hp_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
index 48c9dec4e0..48c9dec4e0 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_flash_hp_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_icu_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_icu_cfg.h
index 5e77b6980f..5e77b6980f 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_icu_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_icu_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_iic_master_cfg.h
index 595ea938d1..595ea938d1 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_iic_master_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_iic_master_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_ioport_cfg.h
index 6b4353d238..6b4353d238 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_ioport_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_ioport_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_lpm_cfg.h
index 5f4d5c4a73..5f4d5c4a73 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_lpm_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_lpm_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_rtc_cfg.h
index 484b7ed044..484b7ed044 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_rtc_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_rtc_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
index c70c0be344..c70c0be344 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_sci_uart_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_spi_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_spi_cfg.h
index 861fe12194..861fe12194 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_cfg/fsp_cfg/r_spi_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_cfg/fsp_cfg/r_spi_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/RA6M2-EK.csv b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/RA6M2-EK.csv
index ff82aa9ce9..ff82aa9ce9 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/RA6M2-EK.csv
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/RA6M2-EK.csv
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/bsp_clock_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/bsp_clock_cfg.h
index 2c93a573b4..2c93a573b4 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/bsp_clock_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/bsp_clock_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/bsp_pin_cfg.h b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/bsp_pin_cfg.h
index c5b93301af..c5b93301af 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/bsp_pin_cfg.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/bsp_pin_cfg.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/common_data.c b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/common_data.c
index 34aad762ff..34aad762ff 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/common_data.c
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/common_data.c
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/common_data.h b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/common_data.h
index e2eb70836b..e2eb70836b 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/common_data.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/common_data.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/hal_data.c b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/hal_data.c
index b0d38881e0..b0d38881e0 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/hal_data.c
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/hal_data.c
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/hal_data.h b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/hal_data.h
index 59d2a91228..59d2a91228 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/hal_data.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/hal_data.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/main.c b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/main.c
index 5b9f980559..5b9f980559 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/main.c
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/main.c
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/pin_data.c b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/pin_data.c
index 28330830c9..28330830c9 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/pin_data.c
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/pin_data.c
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/vector_data.c b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/vector_data.c
index 35de44a48b..35de44a48b 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/vector_data.c
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/vector_data.c
diff --git a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/vector_data.h b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/vector_data.h
index 6629824be8..6629824be8 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/ra_gen/vector_data.h
+++ b/ports/renesas-ra/boards/EK_RA6M2/ra_gen/vector_data.h
diff --git a/ports/renesas-ra/boards/RA6M2_EK/src/hal_entry.c b/ports/renesas-ra/boards/EK_RA6M2/src/hal_entry.c
index c922cfd17a..c922cfd17a 100644
--- a/ports/renesas-ra/boards/RA6M2_EK/src/hal_entry.c
+++ b/ports/renesas-ra/boards/EK_RA6M2/src/hal_entry.c
diff --git a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
index f39cf8f80e..7b8ccb1445 100644
--- a/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
+++ b/ports/renesas-ra/boards/RA4M1_CLICKER/mpconfigboard.h
@@ -1,5 +1,5 @@
 // MCU config
-#define MICROPY_HW_BOARD_NAME       "RA4M1_CLICKER"
+#define MICROPY_HW_BOARD_NAME       "RA4M1 CLICKER"
 #define MICROPY_HW_MCU_NAME         "RA4M1"
 #define MICROPY_HW_MCU_SYSCLK       48000000
 #define MICROPY_HW_MCU_PCLK         48000000
diff --git a/ports/renesas-ra/build_all_boards.sh b/ports/renesas-ra/build_all_boards.sh
index 351047e079..0c192dba93 100644
--- a/ports/renesas-ra/build_all_boards.sh
+++ b/ports/renesas-ra/build_all_boards.sh
@@ -5,22 +5,22 @@ DT=`date +%Y%m%d%H%M`
 make DEBUG=0 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
 make DEBUG=0 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
 #
-export BOARD="RA6M2_EK"
+export BOARD="EK_RA6M2"
 DT=`date +%Y%m%d%H%M`
 make DEBUG=1 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
 make DEBUG=1 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
 #
-export BOARD="RA4M1_EK"
+export BOARD="EK_RA4M1"
 DT=`date +%Y%m%d%H%M`
 make DEBUG=0 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
 make DEBUG=0 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
 #
-export BOARD="RA4W1_EK"
+export BOARD="EK_RA4W1"
 DT=`date +%Y%m%d%H%M`
 make DEBUG=0 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
 make DEBUG=0 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
 #
-export BOARD="RA6M1_EK"
+export BOARD="EK_RA6M1"
 DT=`date +%Y%m%d%H%M`
 make DEBUG=1 BOARD=${BOARD} clean 2>&1 | tee ${BOARD}_build_${DT}.log
 make DEBUG=1 BOARD=${BOARD}       2>&1 | tee -a ${BOARD}_build_${DT}.log
diff --git a/tests/renesas-ra/freq.py b/tests/renesas-ra/freq.py
index 6fbf6ce096..6ce1871f8c 100644
--- a/tests/renesas-ra/freq.py
+++ b/tests/renesas-ra/freq.py
@@ -1,16 +1,16 @@
 #
 # definitions
 #
-MACHINE_RA4M1_CLICKER = "RA4M1_CLICKER with RA4M1"
-MACHINE_RA4M1_EK = "RA4M1_EK with RA4M1"
-MACHINE_RA4W1_EK = "RA4W1_EK with RA4W1"
-MACHINE_RA6M1_EK = "RA6M1_EK with RA6M1"
-MACHINE_RA6M2_EK = "RA6M2_EK with RA6M2"
+MACHINE_RA4M1_CLICKER = "RA4M1 CLICKER with RA4M1"
+MACHINE_EK_RA4M1 = "EK-RA4M1 with RA4M1"
+MACHINE_EK_RA4W1 = "EK-RA4W1 with RA4W1"
+MACHINE_EK_RA6M1 = "EK-RA6M1 with RA6M1"
+MACHINE_EK_RA6M2 = "EK-RA6M2 with RA6M2"
 SYSCLK_RA4M1_CLICKER = 48000000
-SYSCLK_RA4M1_EK = 48000000
-SYSCLK_RA4W1_EK = 48000000
-SYSCLK_RA6M1_EK = 120000000
-SYSCLK_RA6M2_EK = 120000000
+SYSCLK_EK_RA4M1 = 48000000
+SYSCLK_EK_RA4W1 = 48000000
+SYSCLK_EK_RA6M1 = 120000000
+SYSCLK_EK_RA6M2 = 120000000
 
 #
 # machine
@@ -34,26 +34,26 @@ if m == MACHINE_RA4M1_CLICKER:
         print("freq: NG")
 
 
-if m == MACHINE_RA4M1_EK:
-    if f == SYSCLK_RA4M1_EK:
+if m == MACHINE_EK_RA4M1:
+    if f == SYSCLK_EK_RA4M1:
         print("freq: OK")
     else:
         print("freq: NG")
 
-if m == MACHINE_RA4W1_EK:
-    if f == SYSCLK_RA4W1_EK:
+if m == MACHINE_EK_RA4W1:
+    if f == SYSCLK_EK_RA4W1:
         print("freq: OK")
     else:
         print("freq: NG")
 
-if m == MACHINE_RA6M1_EK:
-    if f == SYSCLK_RA6M1_EK:
+if m == MACHINE_EK_RA6M1:
+    if f == SYSCLK_EK_RA6M1:
         print("freq: OK")
     else:
         print("freq: NG")
 
-if m == MACHINE_RA6M2_EK:
-    if f == SYSCLK_RA6M2_EK:
+if m == MACHINE_EK_RA6M2:
+    if f == SYSCLK_EK_RA6M2:
         print("freq: OK")
     else:
         print("freq: NG")
diff --git a/tests/renesas-ra/i2c.py b/tests/renesas-ra/i2c.py
index bb22509e45..3991f7175b 100644
--- a/tests/renesas-ra/i2c.py
+++ b/tests/renesas-ra/i2c.py
@@ -2,11 +2,11 @@ import os
 import time
 
 n = os.uname().machine
-if "RA6M2_EK" in n:
+if "EK-RA6M2" in n:
     i2c_id = 2
-elif "RA6M1_EK" in n:
+elif "EK-RA6M1" in n:
     i2c_id = 0
-elif ("RA4M1_CLICKER" in n) or ("RA4M1_EK" in n) or ("RA4W1_EK" in n):
+elif ("RA4M1 CLICKER" in n) or ("EK-RA4M1" in n) or ("EK-RA4W1" in n):
     print("SKIP")
     raise SystemExit
 else:
diff --git a/tests/renesas-ra/spi.py b/tests/renesas-ra/spi.py
index eb24f37147..52b908efbe 100644
--- a/tests/renesas-ra/spi.py
+++ b/tests/renesas-ra/spi.py
@@ -3,11 +3,11 @@ from machine import SPI
 
 machine = os.uname().machine
 if (
-    "RA6M1_EK" in machine
-    or "RA4M1_CLICKER" in machine
-    or "RA4M1_EK" in machine
-    or "RA4W1_EK" in machine
-    or "RA6M1_EK" in machine
+    "EK-RA6M1" in machine
+    or "RA4M1 CLICKER" in machine
+    or "EK-RA4M1" in machine
+    or "EK-RA4W1" in machine
+    or "EK-RA6M1" in machine
 ):
     spis = (-1, 0)
 else:
diff --git a/tests/renesas-ra/uart1.py b/tests/renesas-ra/uart1.py
index bf7b927602..ba329fb85f 100644
--- a/tests/renesas-ra/uart1.py
+++ b/tests/renesas-ra/uart1.py
@@ -2,29 +2,29 @@ import os
 from machine import UART
 
 machine = os.uname().machine
-if "RA6M2_EK" in machine:
+if "EK-RA6M2" in machine:
     # 0, 7, 9
     uart_ids = (0, 7, 9)
     try_id = 7
     try_s = "UART(7, baudrate=115200, bits=8, parity=None, stop=1, tx=P401, rx=P402, flow=0, rxbuf=259, timeout=0, timeout_char=2)"
-elif "RA4M1_CLICKER" in machine:
+elif "RA4M1 CLICKER" in machine:
     # 0, 1
     uart_ids = (0, 1)
     try_id = 0
     try_s = "UART(0, baudrate=115200, bits=8, parity=None, stop=1, tx=P411, rx=P410, flow=0, rxbuf=259, timeout=0, timeout_char=2)"
-elif "RA4M1_EK" in machine:
+elif "EK-RA4M1" in machine:
     # 0, 1, 2, 9
     # vector for 9 is not registered
     uart_ids = (0, 1, 2)
     try_id = 1
     try_s = "UART(1, baudrate=115200, bits=8, parity=None, stop=1, tx=P401, rx=P402, flow=0, rxbuf=259, timeout=0, timeout_char=2)"
-elif "RA4W1_EK" in machine:
+elif "EK-RA4W1" in machine:
     # 0, 1, 4, 9
     # 0 is disabled.
     uart_ids = (1, 4, 9)
     try_id = 9
     try_s = "UART(9, baudrate=115200, bits=8, parity=None, stop=1, tx=P109, rx=P110, flow=0, rxbuf=259, timeout=0, timeout_char=2)"
-elif "RA6M1_EK" in machine:
+elif "EK-RA6M1" in machine:
     # 0, 1, 2, 3, 4, 8, 9
     # 1/3/4/9 are disabled
     uart_ids = (0, 2, 8)
diff --git a/tools/ci.sh b/tools/ci.sh
index 9146291505..ab1585e5d9 100755
--- a/tools/ci.sh
+++ b/tools/ci.sh
@@ -272,7 +272,10 @@ function ci_renesas_ra_board_build {
     make ${MAKEOPTS} -C mpy-cross
     make ${MAKEOPTS} -C ports/renesas-ra submodules
     make ${MAKEOPTS} -C ports/renesas-ra BOARD=RA4M1_CLICKER
-    make ${MAKEOPTS} -C ports/renesas-ra BOARD=RA6M2_EK
+    make ${MAKEOPTS} -C ports/renesas-ra BOARD=EK_RA6M2
+    make ${MAKEOPTS} -C ports/renesas-ra BOARD=EK_RA6M1
+    make ${MAKEOPTS} -C ports/renesas-ra BOARD=EK_RA4M1
+    make ${MAKEOPTS} -C ports/renesas-ra BOARD=EK_RA4W1
 }
 
 ########################################################################################
diff --git a/tools/metrics.py b/tools/metrics.py
index da4d188568..13161e9b9a 100755
--- a/tools/metrics.py
+++ b/tools/metrics.py
@@ -67,7 +67,7 @@ port_data = {
     "8": PortData("esp8266", "esp8266", "build-GENERIC/firmware.elf"),
     "3": PortData("esp32", "esp32", "build-GENERIC/micropython.elf"),
     "x": PortData("mimxrt", "mimxrt", "build-TEENSY40/firmware.elf"),
-    "e": PortData("renesas-ra", "renesas-ra", "build-RA6M2_EK/firmware.elf"),
+    "e": PortData("renesas-ra", "renesas-ra", "build-EK_RA6M2/firmware.elf"),
     "r": PortData("nrf", "nrf", "build-pca10040/firmware.elf"),
     "p": PortData("rp2", "rp2", "build-PICO/firmware.elf"),
     "d": PortData("samd", "samd", "build-ADAFRUIT_ITSYBITSY_M4_EXPRESS/firmware.elf"),