4 files changed, 30 insertions, 30 deletions
diff --git a/tests/renesas-ra/freq.py b/tests/renesas-ra/freq.py
index 6fbf6ce09..6ce1871f8 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 bb22509e4..3991f7175 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 eb24f3714..52b908efb 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 bf7b92760..ba329fb85 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)