diff --git a/boards/ark/can-flow/src/boot.c b/boards/ark/can-flow/src/boot.c
index 676f541048..824dc1f7f1 100644
--- a/boards/ark/can-flow/src/boot.c
+++ b/boards/ark/can-flow/src/boot.c
@@ -76,7 +76,7 @@ __EXPORT void stm32_boardinitialize(void)
 }
 
 /************************************************************************************
- * Name: stm32_boarddeinitialize
+ * Name: board_deinitialize
  *
  * Description:
  *   This function is called by the bootloader code prior to booting
@@ -84,7 +84,7 @@ __EXPORT void stm32_boardinitialize(void)
  *
  ************************************************************************************/
 
-void stm32_boarddeinitialize(void)
+void board_deinitialize(void)
 {
 	putreg32(getreg32(STM32_RCC_APB1RSTR) | RCC_APB1RSTR_CAN1RST, STM32_RCC_APB1RSTR);
 }
diff --git a/boards/cuav/can-gps-v1/src/boot.c b/boards/cuav/can-gps-v1/src/boot.c
index 55ef75e136..ba0042be9f 100644
--- a/boards/cuav/can-gps-v1/src/boot.c
+++ b/boards/cuav/can-gps-v1/src/boot.c
@@ -76,7 +76,7 @@ __EXPORT void stm32_boardinitialize(void)
 }
 
 /************************************************************************************
- * Name: stm32_boarddeinitialize
+ * Name: board_deinitialize
  *
  * Description:
  *   This function is called by the bootloader code prior to booting
@@ -84,7 +84,7 @@ __EXPORT void stm32_boardinitialize(void)
  *
  ************************************************************************************/
 
-void stm32_boarddeinitialize(void)
+void board_deinitialize(void)
 {
 	putreg32(getreg32(STM32_RCC_APB1RSTR) | RCC_APB1RSTR_CAN1RST, STM32_RCC_APB1RSTR);
 }
diff --git a/boards/holybro/can-gps-v1/src/boot.c b/boards/holybro/can-gps-v1/src/boot.c
index 132f91d573..4dc967f8f3 100644
--- a/boards/holybro/can-gps-v1/src/boot.c
+++ b/boards/holybro/can-gps-v1/src/boot.c
@@ -80,7 +80,7 @@ __EXPORT void stm32_boardinitialize(void)
 }
 
 /************************************************************************************
- * Name: stm32_boarddeinitialize
+ * Name: board_deinitialize
  *
  * Description:
  *   This function is called by the bootloader code prior to booting
@@ -88,7 +88,7 @@ __EXPORT void stm32_boardinitialize(void)
  *
  ************************************************************************************/
 
-void stm32_boarddeinitialize(void)
+void board_deinitialize(void)
 {
 	putreg32(getreg32(STM32_RCC_APB1RSTR) | RCC_APB1RSTR_CAN1RST, STM32_RCC_APB1RSTR);
 }
diff --git a/boards/nxp/ucans32k146/src/can_boot.c b/boards/nxp/ucans32k146/src/can_boot.c
index ad8a0e102d..b9213bb901 100644
--- a/boards/nxp/ucans32k146/src/can_boot.c
+++ b/boards/nxp/ucans32k146/src/can_boot.c
@@ -80,7 +80,7 @@ __EXPORT void s32k1xx_board_initialize(void)
 }
 
 /************************************************************************************
- * Name: stm32_boarddeinitialize
+ * Name: board_deinitialize
  *
  * Description:
  *   This function is called by the bootloader code prior to booting
@@ -88,7 +88,7 @@ __EXPORT void s32k1xx_board_initialize(void)
  *
  ************************************************************************************/
 
-void stm32_boarddeinitialize(void)
+void board_deinitialize(void)
 {
 	uint32_t regval  = getreg32(S32K1XX_CAN0_MCR);
 	regval |= CAN_MCR_MDIS;
diff --git a/platforms/nuttx/src/canbootloader/include/board.h b/platforms/nuttx/src/canbootloader/include/board.h
index 20fbf48179..36365b7082 100644
--- a/platforms/nuttx/src/canbootloader/include/board.h
+++ b/platforms/nuttx/src/canbootloader/include/board.h
@@ -62,7 +62,7 @@ typedef enum {
 #ifndef __ASSEMBLY__
 
 /************************************************************************************
- * Name: stm32_boarddeinitialize
+ * Name: board_deinitialize
  *
  * Description:
  *   This function is called by the bootloader code priore to booting
@@ -70,7 +70,7 @@ typedef enum {
  *
  ************************************************************************************/
 
-void stm32_boarddeinitialize(void);
+void board_deinitialize(void);
 
 /****************************************************************************
  * Name: board_get_product_name
diff --git a/platforms/nuttx/src/canbootloader/uavcan/main.c b/platforms/nuttx/src/canbootloader/uavcan/main.c
index 6ff19f4e8f..dab42f117e 100644
--- a/platforms/nuttx/src/canbootloader/uavcan/main.c
+++ b/platforms/nuttx/src/canbootloader/uavcan/main.c
@@ -952,7 +952,7 @@ static void application_run(size_t fw_image_size, bootloader_app_shared_t *commo
 
 		__asm__ __volatile__("\tcpsid  i\n");
 
-		stm32_boarddeinitialize();
+		board_deinitialize();
 
 		/* kill the systick interrupt */
 		putreg32(0, NVIC_SYSTICK_CTRL);