diff --git a/.github/workflows/githubci.yml b/.github/workflows/githubci.yml
index 3f6d7cac7..487bdca49 100644
--- a/.github/workflows/githubci.yml
+++ b/.github/workflows/githubci.yml
@@ -41,12 +41,12 @@ jobs:
     - name: Install BSP and Libraries
       env:
         BSP_URL: https://soburi.github.io/openthread_nrf52_arduino/package_soburi_otnrf52_index.json
-        BSP_PATH: .arduino15/packages/soburi/hardware/otnrf52
+        BSP_PATH: .arduino15/packages/soburi/hardware/nrf52
       run: |
         arduino-cli config init
         arduino-cli core update-index
         arduino-cli core update-index --additional-urls $BSP_URL
-        arduino-cli core install soburi:otnrf52 --additional-urls $BSP_URL
+        arduino-cli core install soburi:nrf52 --additional-urls $BSP_URL
         # Repalce release BSP with our code
         BSP_VERSION=`eval ls $HOME/$BSP_PATH`
         rm -r $HOME/$BSP_PATH/*
diff --git a/.github/workflows/update_package_list.py b/.github/workflows/update_package_list.py
index fae1df8d5..bcfce962a 100644
--- a/.github/workflows/update_package_list.py
+++ b/.github/workflows/update_package_list.py
@@ -13,7 +13,7 @@
 
     node = {
         "name": "OpenThread nRF52840 Boards",
-        "architecture": "otnrf52",
+        "architecture": "nrf52",
         "category": "Contributed",
         "version": tag,
         "url": f"https://github.com/soburi/openthread_nrf52_arduino/archive/{tag}.zip",
diff --git a/platform.txt b/platform.txt
index 6cdccd3c4..9783ddddf 100644
--- a/platform.txt
+++ b/platform.txt
@@ -67,7 +67,7 @@ build.flags.openthread_config="openthread-config-wrap.h"
 build.flags.mbedtls_config="nrf-config.h"
 build.flags.mbedtls_user_config="nrf52840-mbedtls-config.h"
 build.flags.openthread.ftd= -DOPENTHREAD_CONFIG_BORDER_AGENT_ENABLE=1 -DOPENTHREAD_CONFIG_BORDER_ROUTER_ENABLE=1 -DOPENTHREAD_CONFIG_CHILD_SUPERVISION_ENABLE=1 -DOPENTHREAD_CONFIG_COAP_API_ENABLE=1 -DOPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE=1 -DOPENTHREAD_CONFIG_COMMISSIONER_ENABLE=1 -DOPENTHREAD_CONFIG_DHCP6_CLIENT_ENABLE=1 -DOPENTHREAD_CONFIG_DHCP6_SERVER_ENABLE=1 -DOPENTHREAD_CONFIG_DIAG_ENABLE=1 -DOPENTHREAD_CONFIG_DNS_CLIENT_ENABLE=1 -DOPENTHREAD_CONFIG_ECDSA_ENABLE=1 -DOPENTHREAD_CONFIG_ENABLE_BUILTIN_MBEDTLS=0 -DOPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE=1 -DOPENTHREAD_CONFIG_IP6_SLAAC_ENABLE=1 -DOPENTHREAD_CONFIG_JAM_DETECTION_ENABLE=1 -DOPENTHREAD_CONFIG_JOINER_ENABLE=1 -DOPENTHREAD_CONFIG_LINK_RAW_ENABLE=1 -DOPENTHREAD_CONFIG_MAC_FILTER_ENABLE=1 -DOPENTHREAD_CONFIG_NCP_UART_ENABLE=1 -DOPENTHREAD_CONFIG_SNTP_CLIENT_ENABLE=1 -DOPENTHREAD_CONFIG_THREAD_VERSION=2 -DOPENTHREAD_CONFIG_TMF_NETDATA_SERVICE_ENABLE=1 -DOPENTHREAD_CONFIG_TMF_NETWORK_DIAG_MTD_ENABLE=1 -DOPENTHREAD_CONFIG_UDP_FORWARD_ENABLE=1 -DOPENTHREAD_ENABLE_NCP_SPINEL_ENCRYPTER=0 -DOPENTHREAD_ENABLE_VENDOR_EXTENSION=0 -DOPENTHREAD_EXAMPLES_SIMULATION=0 -DOPENTHREAD_FTD=1 -DOPENTHREAD_MTD=0 -DOPENTHREAD_PLATFORM_POSIX=0 -DOPENTHREAD_POSIX_CONFIG_DAEMON_ENABLE=0 -DOPENTHREAD_RADIO=0
-build.flags.openthread= {build.flags.openthread.ftd} -DMBEDTLS_CONFIG_FILE={build.flags.mbedtls_config} -DMBEDTLS_USER_CONFIG_FILE={build.flags.mbedtls_user_config} -DOPENTHREAD_CONFIG_FILE={build.flags.openthread_config} -DMBEDTLS_USER_CONFIG_FILE={build.flags.mbedtls_user_config} -DCONFIG_GPIO_AS_PINRESET -DNRF_SD_BLE_API_VERSION=7 -DS140 -D__HEAP_SIZE=8192 -D__STACK_SIZE=8192 -DSOFTDEVICE_PRESENT -DFREERTOS -DMULTIPROTOCOL_802154_CONFIG_PRESENT -DNRF52840_XXAA -DBOARD_PCA10056 -D_BSD_SOURCE=1 -D_DEFAULT_SOURCE=1 {build.flags.nordic_includes}
+build.flags.openthread= {build.flags.openthread.ftd} -DMBEDTLS_CONFIG_FILE={build.flags.mbedtls_config} -DMBEDTLS_USER_CONFIG_FILE={build.flags.mbedtls_user_config} -DOPENTHREAD_CONFIG_FILE={build.flags.openthread_config} -DMBEDTLS_USER_CONFIG_FILE={build.flags.mbedtls_user_config} -DCONFIG_GPIO_AS_PINRESET -D__HEAP_SIZE=8192 -D__STACK_SIZE=8192 -DFREERTOS -DNRF52840_XXAA -DBOARD_PCA10056 {build.flags.nordic_includes}
 build.flags.nordic_includes= -I{nordic.path}/config/nrf52840/config -I{nordic.path}/softdevice/common -I{nordic.path}/softdevice/s140_nrf52_7.0.1_API/include -I{nordic.path}/softdevice/s140_nrf52_7.0.1_API/include/nrf52 -I{nordic.path}/nrfx -I{nordic.path}/nrfx/legacy -I{nordic.path}/nrfx/drivers/include -I{nordic.path}/nrfx/hal -I{nordic.path}/nrfx/mdk -I{nordic.path}/components/libraries/experimental_section_vars -I{nordic.path}/components/libraries/log -I{nordic.path}/components/libraries/strerror -I{nordic.path}/components/libraries/util -I{nordic.path}/external/nRF-IEEE-802.15.4-radio-driver/src -I{nordic.path}/external/nRF-IEEE-802.15.4-radio-driver/src/fem -I{nordic.path}/external/nRF-IEEE-802.15.4-radio-driver/src/fem/three_pin_gpio -I{nordic.path}/external/nRF-IEEE-802.15.4-radio-driver/src/rsch/raal/softdevice -I{nordic.path}/external/nrf_security/config -I{nordic.path}/external/nrf_security/include -I{nordic.path}/external/nrf_security/mbedtls_plat_config -I{nordic.path}/external/nrf_security/nrf_cc310_plat/include -I{nordic.path}/external/openthread/include
 
 libnrf_cc310.path={nordic.path}/external/nrf_security/lib
diff --git a/tools/build_all.py b/tools/build_all.py
index 6b2078d5c..a564872bb 100644
--- a/tools/build_all.py
+++ b/tools/build_all.py
@@ -42,7 +42,7 @@ def build_examples(variant):
     print((build_format + '| {:6} |').format('Library', 'Example', 'Result', 'Time'))
     print(build_separator)
     
-    fqbn = "soburi:otnrf52:{}:softdevice={},debug=l0".format(variant, 's140v7')
+    fqbn = "soburi:nrf52:{}:softdevice={},debug=l0".format(variant, 's140v7')
 
     for sketch in glob.iglob('libraries/**/*.ino', recursive=True):
         start_time = time.monotonic()