diff --git a/boards/Kconfig b/boards/Kconfig
index 5a8133b680..d2c35c71b0 100644
--- a/boards/Kconfig
+++ b/boards/Kconfig
@@ -1465,14 +1465,14 @@ config ARCH_BOARD_RDDRONE_UAVCAN144
 		This options selects support for NuttX on the NXP RDDRONE-UAVCAN board
 		featuring the S32K144 Cortex-M4F.
 
-config ARCH_BOARD_RDDRONE_UAVCAN146
-	bool "NXP RDDRONE-UAVCAN146"
+config ARCH_BOARD_UCANS32K146
+	bool "NXP UCANS32K146"
 	depends on ARCH_CHIP_S32K146
 	select ARCH_HAVE_LEDS
 	select ARCH_HAVE_BUTTONS
 	select ARCH_HAVE_IRQBUTTONS
 	---help---
-		This options selects support for NuttX on the NXP RDDRONE-UAVCAN board
+		This options selects support for NuttX on the NXP UCANS32K board
 		featuring the S32K146 Cortex-M4F.
 
 config ARCH_BOARD_S32K146EVB
@@ -2475,7 +2475,7 @@ config ARCH_BOARD
 	default "s32k118evb"               if ARCH_BOARD_S32K118EVB
 	default "s32k144evb"               if ARCH_BOARD_S32K144EVB
 	default "rddrone-uavcan144"        if ARCH_BOARD_RDDRONE_UAVCAN144
-	default "rddrone-uavcan146"        if ARCH_BOARD_RDDRONE_UAVCAN146
+	default "ucans32k146"              if ARCH_BOARD_UCANS32K146
 	default "rv32m1-vega"              if ARCH_BOARD_RV32M1_VEGA
 	default "s32k146evb"               if ARCH_BOARD_S32K146EVB
 	default "s32k148evb"               if ARCH_BOARD_S32K148EVB
@@ -2637,8 +2637,8 @@ endif
 if ARCH_BOARD_RDDRONE_UAVCAN144
 source "boards/arm/s32k1xx/rddrone-uavcan144/Kconfig"
 endif
-if ARCH_BOARD_RDDRONE_UAVCAN146
-source "boards/arm/s32k1xx/rddrone-uavcan146/Kconfig"
+if ARCH_BOARD_UCANS32K146
+source "boards/arm/s32k1xx/ucans32k146/Kconfig"
 endif
 if ARCH_BOARD_S32K146EVB
 source "boards/arm/s32k1xx/s32k146evb/Kconfig"
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/Kconfig b/boards/arm/s32k1xx/ucans32k146/Kconfig
similarity index 66%
rename from boards/arm/s32k1xx/rddrone-uavcan146/Kconfig
rename to boards/arm/s32k1xx/ucans32k146/Kconfig
index 77a4ee5f7d..47d49399bd 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/Kconfig
+++ b/boards/arm/s32k1xx/ucans32k146/Kconfig
@@ -3,6 +3,6 @@
 # see the file kconfig-language.txt in the NuttX tools repository.
 #
 
-if ARCH_BOARD_RDDRONE_UAVCAN146
+if ARCH_BOARD_UCANS32K146
 
-endif # ARCH_BOARD_RDDRONE_UAVCAN146
+endif # ARCH_BOARD_UCANS32K146
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/README.txt b/boards/arm/s32k1xx/ucans32k146/README.txt
similarity index 66%
rename from boards/arm/s32k1xx/rddrone-uavcan146/README.txt
rename to boards/arm/s32k1xx/ucans32k146/README.txt
index 69f96c0a07..4162fb0c36 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/README.txt
+++ b/boards/arm/s32k1xx/ucans32k146/README.txt
@@ -1,7 +1,7 @@
 README
 ======
 
-This directory holds the port to the NXP RDDRONE-UAVCAN board with S32K146 MCU.
+This directory holds the port to the NXP UCANS32K board with S32K146 MCU.
 
 Contents
 ========
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig b/boards/arm/s32k1xx/ucans32k146/configs/nsh/defconfig
similarity index 96%
rename from boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig
rename to boards/arm/s32k1xx/ucans32k146/configs/nsh/defconfig
index 20d9e5e108..1a5018ffdf 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nsh/defconfig
+++ b/boards/arm/s32k1xx/ucans32k146/configs/nsh/defconfig
@@ -12,8 +12,8 @@
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
 # CONFIG_NSH_CMDPARMS is not set
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="rddrone-uavcan146"
-CONFIG_ARCH_BOARD_RDDRONE_UAVCAN146=y
+CONFIG_ARCH_BOARD="ucans32k146"
+CONFIG_ARCH_BOARD_UCANS32K146=y
 CONFIG_ARCH_CHIP="s32k1xx"
 CONFIG_ARCH_CHIP_S32K146=y
 CONFIG_ARCH_CHIP_S32K14X=y
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig b/boards/arm/s32k1xx/ucans32k146/configs/nshdebug/defconfig
similarity index 95%
rename from boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig
rename to boards/arm/s32k1xx/ucans32k146/configs/nshdebug/defconfig
index 65465dc498..b73cfbee01 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/configs/nshdebug/defconfig
+++ b/boards/arm/s32k1xx/ucans32k146/configs/nshdebug/defconfig
@@ -10,8 +10,8 @@
 # CONFIG_NSH_CMDOPT_HEXDUMP is not set
 # CONFIG_NSH_CMDPARMS is not set
 CONFIG_ARCH="arm"
-CONFIG_ARCH_BOARD="rddrone-uavcan146"
-CONFIG_ARCH_BOARD_RDDRONE_UAVCAN146=y
+CONFIG_ARCH_BOARD="ucans32k146"
+CONFIG_ARCH_BOARD_UCANS32K146=y
 CONFIG_ARCH_CHIP="s32k1xx"
 CONFIG_ARCH_CHIP_S32K146=y
 CONFIG_ARCH_CHIP_S32K14X=y
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/include/board.h b/boards/arm/s32k1xx/ucans32k146/include/board.h
similarity index 90%
rename from boards/arm/s32k1xx/rddrone-uavcan146/include/board.h
rename to boards/arm/s32k1xx/ucans32k146/include/board.h
index 631684b133..a8fd676db9 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/include/board.h
+++ b/boards/arm/s32k1xx/ucans32k146/include/board.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/s32k1xx/rddrone-uavcan146/include/board.h
+ * boards/arm/s32k1xx/ucans32k146/include/board.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_ARM_RDDRONE_UAVCAN146_INCLUDE_BOARD_H
-#define __BOARDS_ARM_RDDRONE_UAVCAN146_INCLUDE_BOARD_H
+#ifndef __BOARDS_ARM_S32K1XX_UCANS32K146_INCLUDE_BOARD_H
+#define __BOARDS_ARM_S32K1XX_UCANS32K146_INCLUDE_BOARD_H
 
 /****************************************************************************
  * Included Files
@@ -38,7 +38,7 @@
 
 /* Clocking *****************************************************************/
 
-/* The RDDRONE-UAVCAN146 is fitted with a 8MHz Crystal */
+/* The UCANS32K146 is fitted with a 8MHz Crystal */
 
 #define BOARD_XTAL_FREQUENCY 8000000
 
@@ -46,7 +46,7 @@
 
 /* LED definitions **********************************************************/
 
-/* The RDDRONE-UAVCAN146 has one RGB LED:
+/* The UCANS32K146 has one RGB LED:
  *
  *   RedLED   PTD15 (FTM0 CH0)
  *   GreenLED PTD16 (FTM0 CH1)
@@ -80,7 +80,7 @@
 #define BOARD_REVISION_DETECT_PIN  (GPIO_INPUT | PIN_PORTA | PIN10 )
 
 /* If CONFIG_ARCH_LEDs is defined, then NuttX will control the LEDs on board
- * the RDDRONE-UAVCAN146.  The following definitions describe how NuttX
+ * the UCANS32K146.  The following definitions describe how NuttX
  * controls the LEDs:
  *
  *   SYMBOL                Meaning                      LED state
@@ -96,11 +96,11 @@
 #define LED_SIGNAL        0 /* In a signal handler      (no change)       */
 #define LED_ASSERTION     0 /* An assertion failed      (no change)       */
 #define LED_PANIC         4 /* The system has crashed    FLASH OFF    OFF */
-#undef  LED_IDLE            /* RDDRONE-UAVCAN146 in sleep mode (Not used) */
+#undef  LED_IDLE            /* UCANS32K146 in sleep mode (Not used) */
 
 /* Button definitions *******************************************************/
 
-/* The RDDRONE-UAVCAN146 supports two buttons:
+/* The UCANS32K146 supports two buttons:
  *
  *   SW2  PTC12
  *   SW3  PTC13
@@ -149,4 +149,4 @@
 #define PIN_CAN1_RX      PIN_CAN1_RX_1      /* PTA12 */
 #define PIN_CAN1_STB     (GPIO_OUTPUT | PIN_PORTE | PIN10 )
 
-#endif  /* __BOARDS_ARM_RDDRONE_UAVCAN146_INCLUDE_BOARD_H */
+#endif  /* __BOARDS_ARM_S32K1XX_UCANS32K146_INCLUDE_BOARD_H */
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/scripts/Make.defs b/boards/arm/s32k1xx/ucans32k146/scripts/Make.defs
similarity index 97%
rename from boards/arm/s32k1xx/rddrone-uavcan146/scripts/Make.defs
rename to boards/arm/s32k1xx/ucans32k146/scripts/Make.defs
index 6b5ed866e0..815cd368c8 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/scripts/Make.defs
+++ b/boards/arm/s32k1xx/ucans32k146/scripts/Make.defs
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/s32k1xx/rddrone-uavcan146/scripts/Make.defs
+# boards/arm/s32k1xx/ucans32k146/scripts/Make.defs
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/scripts/flash.ld b/boards/arm/s32k1xx/ucans32k146/scripts/flash.ld
similarity index 98%
rename from boards/arm/s32k1xx/rddrone-uavcan146/scripts/flash.ld
rename to boards/arm/s32k1xx/ucans32k146/scripts/flash.ld
index bd8e4c20d3..30f7f8fec3 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/scripts/flash.ld
+++ b/boards/arm/s32k1xx/ucans32k146/scripts/flash.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/s32k1xx/rddrone-uavcan146/scripts/flash.ld
+ * boards/arm/s32k1xx/ucans32k146/scripts/flash.ld
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/scripts/s32k146.cfg b/boards/arm/s32k1xx/ucans32k146/scripts/s32k146.cfg
similarity index 100%
rename from boards/arm/s32k1xx/rddrone-uavcan146/scripts/s32k146.cfg
rename to boards/arm/s32k1xx/ucans32k146/scripts/s32k146.cfg
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/scripts/sram.ld b/boards/arm/s32k1xx/ucans32k146/scripts/sram.ld
similarity index 98%
rename from boards/arm/s32k1xx/rddrone-uavcan146/scripts/sram.ld
rename to boards/arm/s32k1xx/ucans32k146/scripts/sram.ld
index a775f8a471..fe0c291b74 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/scripts/sram.ld
+++ b/boards/arm/s32k1xx/ucans32k146/scripts/sram.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/s32k1xx/rddrone-uavcan146/scripts/sram.ld
+ * boards/arm/s32k1xx/ucans32k146/scripts/sram.ld
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/Makefile b/boards/arm/s32k1xx/ucans32k146/src/Makefile
similarity index 96%
rename from boards/arm/s32k1xx/rddrone-uavcan146/src/Makefile
rename to boards/arm/s32k1xx/ucans32k146/src/Makefile
index aba9a82da6..fa82890dc4 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/src/Makefile
+++ b/boards/arm/s32k1xx/ucans32k146/src/Makefile
@@ -1,5 +1,5 @@
 ############################################################################
-# boards/arm/s32k1xx/rddrone-uavcan146/src/Makefile
+# boards/arm/s32k1xx/ucans32k146/src/Makefile
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_appinit.c b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_appinit.c
similarity index 97%
rename from boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_appinit.c
rename to boards/arm/s32k1xx/ucans32k146/src/s32k1xx_appinit.c
index 7dd9593060..6a9e17c4a2 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_appinit.c
+++ b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_appinit.c
+ * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_appinit.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -26,7 +26,7 @@
 
 #include <nuttx/board.h>
 
-#include "rddrone-uavcan146.h"
+#include "ucans32k146.h"
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_autoleds.c b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_autoleds.c
similarity index 97%
rename from boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_autoleds.c
rename to boards/arm/s32k1xx/ucans32k146/src/s32k1xx_autoleds.c
index 610bac8687..1012c33329 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_autoleds.c
+++ b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_autoleds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_autoleds.c
+ * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_autoleds.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,7 @@
  *
  ****************************************************************************/
 
-/* The RDDRONE-UAVCAN146 has one RGB LED:
+/* The UCANS32K146 has one RGB LED:
  *
  *   RedLED   PTD15 (FTM0 CH0)
  *   GreenLED PTD16 (FTM0 CH1)
@@ -61,7 +61,7 @@
 #include "arm_internal.h"
 
 #include "s32k1xx_pin.h"
-#include "rddrone-uavcan146.h"
+#include "ucans32k146.h"
 
 #include <arch/board/board.h>
 
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_boot.c b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_boot.c
similarity index 96%
rename from boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_boot.c
rename to boards/arm/s32k1xx/ucans32k146/src/s32k1xx_boot.c
index e7602a1c10..0dc12eb2c8 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_boot.c
+++ b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_boot.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_boot.c
+ * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_boot.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -28,7 +28,7 @@
 
 #include <nuttx/board.h>
 
-#include "rddrone-uavcan146.h"
+#include "ucans32k146.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_bringup.c b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_bringup.c
similarity index 97%
rename from boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_bringup.c
rename to boards/arm/s32k1xx/ucans32k146/src/s32k1xx_bringup.c
index 9a2eaab57f..e4ced26a82 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_bringup.c
+++ b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_bringup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_bringup.c
+ * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_bringup.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -47,7 +47,7 @@
 #  include "s32k1xx_eeeprom.h"
 #endif
 
-#include "rddrone-uavcan146.h"
+#include "ucans32k146.h"
 
 /****************************************************************************
  * Public Functions
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_buttons.c b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_buttons.c
similarity index 96%
rename from boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_buttons.c
rename to boards/arm/s32k1xx/ucans32k146/src/s32k1xx_buttons.c
index 7325610b3d..2e004c8ee5 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_buttons.c
+++ b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_buttons.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_buttons.c
+ * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_buttons.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,7 +18,7 @@
  *
  ****************************************************************************/
 
-/* The RDDRONE-UAVCAN146 supports one button:
+/* The UCANS32K146 supports one button:
  *
  *   SW3  PTC14
  */
@@ -36,7 +36,7 @@
 #include <nuttx/board.h>
 
 #include "s32k1xx_pin.h"
-#include "rddrone-uavcan146.h"
+#include "ucans32k146.h"
 
 #include <arch/board/board.h>
 
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_clockconfig.c b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_clockconfig.c
similarity index 99%
rename from boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_clockconfig.c
rename to boards/arm/s32k1xx/ucans32k146/src/s32k1xx_clockconfig.c
index badf9be072..0ab0e055d7 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_clockconfig.c
+++ b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_clockconfig.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_clockconfig.c
+ * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_clockconfig.c
  *
  *   Copyright (C) 2019 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -63,7 +63,7 @@
 
 #include "s32k1xx_clockconfig.h"
 #include "s32k1xx_start.h"
-#include "rddrone-uavcan146.h"
+#include "ucans32k146.h"
 
 /****************************************************************************
  * Public Data
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_periphclocks.c b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_periphclocks.c
similarity index 98%
rename from boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_periphclocks.c
rename to boards/arm/s32k1xx/ucans32k146/src/s32k1xx_periphclocks.c
index 9856412cef..7da86c5de6 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_periphclocks.c
+++ b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_periphclocks.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_periphclocks.c
+ * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_periphclocks.c
  *
  *   Copyright (C) 2019 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -59,7 +59,7 @@
 #include <nuttx/config.h>
 
 #include "s32k1xx_periphclocks.h"
-#include "rddrone-uavcan146.h"
+#include "ucans32k146.h"
 
 /****************************************************************************
  * Public Data
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_spi.c b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_spi.c
similarity index 96%
rename from boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_spi.c
rename to boards/arm/s32k1xx/ucans32k146/src/s32k1xx_spi.c
index f419ff7b2f..d83125c5a9 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_spi.c
+++ b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_spi.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_spi.c
+ * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_spi.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -38,7 +38,7 @@
 #include "s32k1xx_config.h"
 #include "s32k1xx_lpspi.h"
 #include "s32k1xx_pin.h"
-#include "rddrone-uavcan146.h"
+#include "ucans32k146.h"
 
 #if defined(CONFIG_S32K1XX_LPSPI0) || defined(CONFIG_S32K1XX_LPSPI1) || \
     defined(CONFIG_S32K1XX_LPSPI2)
@@ -51,8 +51,7 @@
  * Name: s32k1xx_spidev_initialize
  *
  * Description:
- *   Called to configure SPI chip select GPIO pins for the RDDRONE-UAVCAN146
- *   board.
+ *   Called to configure SPI chip select GPIO pins for the UCANS32K146 board.
  *
  ****************************************************************************/
 
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_userleds.c
similarity index 96%
rename from boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c
rename to boards/arm/s32k1xx/ucans32k146/src/s32k1xx_userleds.c
index 2e7573a865..f3ef272444 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c
+++ b/boards/arm/s32k1xx/ucans32k146/src/s32k1xx_userleds.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/s32k1xx/rddrone-uavcan146/src/s32k1xx_userleds.c
+ * boards/arm/s32k1xx/ucans32k146/src/s32k1xx_userleds.c
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -34,7 +34,7 @@
 #include "arm_internal.h"
 
 #include "s32k1xx_pin.h"
-#include "rddrone-uavcan146.h"
+#include "ucans32k146.h"
 
 #include <arch/board/board.h>
 
diff --git a/boards/arm/s32k1xx/rddrone-uavcan146/src/rddrone-uavcan146.h b/boards/arm/s32k1xx/ucans32k146/src/ucans32k146.h
similarity index 87%
rename from boards/arm/s32k1xx/rddrone-uavcan146/src/rddrone-uavcan146.h
rename to boards/arm/s32k1xx/ucans32k146/src/ucans32k146.h
index d20327b525..c3aa9a483d 100644
--- a/boards/arm/s32k1xx/rddrone-uavcan146/src/rddrone-uavcan146.h
+++ b/boards/arm/s32k1xx/ucans32k146/src/ucans32k146.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * boards/arm/s32k1xx/rddrone-uavcan146/src/rddrone-uavcan146.h
+ * boards/arm/s32k1xx/ucans32k146/src/ucans32k146.h
  *
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -18,8 +18,8 @@
  *
  ****************************************************************************/
 
-#ifndef __BOARDS_ARM_S32K1XX_RDDRONE_UAVCAN146_SRC_RDDRONE_UAVCAN146_H
-#define __BOARDS_ARM_S32K1XX_RDDRONE_UAVCAN146_SRC_RDDRONE_UAVCAN146_H
+#ifndef __BOARDS_ARM_S32K1XX_UCANS32K146_SRC_UCANS32K146_H
+#define __BOARDS_ARM_S32K1XX_UCANS32K146_SRC_UCANS32K146_H
 
 /****************************************************************************
  * Included Files
@@ -39,9 +39,9 @@
 
 /* Configuration ************************************************************/
 
-/* RDDRONE-UAVCAN146 GPIOs **************************************************/
+/* UCANS32K146 GPIOs ********************************************************/
 
-/* LEDs.  The RDDRONE-UAVCAN146 has one RGB LED:
+/* LEDs.  The UCANS32K146 has one RGB LED:
  *
  *   RedLED   PTD15 (FTM0 CH0)
  *   GreenLED PTD16 (FTM0 CH1)
@@ -54,7 +54,7 @@
 #define GPIO_LED_G     (PIN_PTD16 | GPIO_LOWDRIVE | GPIO_OUTPUT_ZERO)
 #define GPIO_LED_B     (PIN_PTD0  | GPIO_LOWDRIVE | GPIO_OUTPUT_ZERO)
 
-/* Buttons.  The RDDRONE-UAVCAN146 supports one button:
+/* Buttons.  The UCANS32K146 supports one button:
  *
  *   SW3  PTC14
  */
@@ -109,8 +109,7 @@ int s32k1xx_bringup(void);
  * Name: s32k1xx_spidev_initialize
  *
  * Description:
- *   Called to configure SPI chip select GPIO pins for the RDDRONE-UAVCAN146
- *   board.
+ *   Called to configure SPI chip select GPIO pins for the UCANS32K146 board.
  *
  ****************************************************************************/
 
@@ -119,4 +118,4 @@ void s32k1xx_spidev_initialize(void);
 #endif
 
 #endif /* __ASSEMBLY__ */
-#endif /* __BOARDS_ARM_S32K1XX_RDDRONE_UAVCAN146_SRC_RDDRONE_UAVCAN146_H */
+#endif /* __BOARDS_ARM_S32K1XX_UCANS32K146_SRC_UCANS32K146_H */