diff --git a/arch/arm/src/armv6-m/arm_dumpnvic.c b/arch/arm/src/armv6-m/arm_dumpnvic.c
index 6bdd83fe590..febdf7cc22e 100644
--- a/arch/arm/src/armv6-m/arm_dumpnvic.c
+++ b/arch/arm/src/armv6-m/arm_dumpnvic.c
@@ -55,14 +55,14 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Function:  up_dumpnvic
+ * Function:  arm_dumpnvic
  *
  * Description:
  *   Dump all NVIC and SYSCON registers along with a user message.
  *
  ****************************************************************************/
 
-void up_dumpnvic(FAR const char *msg)
+void arm_dumpnvic(FAR const char *msg)
 {
 #ifdef CONFIG_DEBUG_INFO
   irqstate_t flags;
diff --git a/arch/arm/src/armv6-m/nvic.h b/arch/arm/src/armv6-m/nvic.h
index b6f4391a4a6..bbe792ee2a4 100644
--- a/arch/arm/src/armv6-m/nvic.h
+++ b/arch/arm/src/armv6-m/nvic.h
@@ -380,7 +380,7 @@ extern "C"
  ****************************************************************************************************/
 
 /****************************************************************************************************
- * Function:  up_dumpnvic
+ * Function:  arm_dumpnvic
  *
  * Description:
  *   Dump all NVIC and SYSCON registers along with a user message.
@@ -388,9 +388,9 @@ extern "C"
  ****************************************************************************************************/
 
 #ifdef CONFIG_DEBUG_FEATURES
-void up_dumpnvic(FAR const char *msg);
+void arm_dumpnvic(FAR const char *msg);
 #else
-#  define up_dumpnvic(m)
+#  define arm_dumpnvic(m)
 #endif
 
 #undef EXTERN
diff --git a/arch/arm/src/armv7-m/arm_ramvec_attach.c b/arch/arm/src/armv7-m/arm_ramvec_attach.c
index a2caaaba114..157a30eada5 100644
--- a/arch/arm/src/armv7-m/arm_ramvec_attach.c
+++ b/arch/arm/src/armv7-m/arm_ramvec_attach.c
@@ -43,7 +43,7 @@
 void exception_common(void);
 
 /****************************************************************************
- * Name: up_ramvec_attach
+ * Name: arm_ramvec_attach
  *
  * Description:
  *   Configure the ram vector table so that IRQ number 'irq' will be
@@ -51,7 +51,7 @@ void exception_common(void);
  *
  ****************************************************************************/
 
-int up_ramvec_attach(int irq, up_vector_t vector)
+int arm_ramvec_attach(int irq, up_vector_t vector)
 {
   int ret = -EINVAL;
 
diff --git a/arch/arm/src/armv7-m/arm_ramvec_initialize.c b/arch/arm/src/armv7-m/arm_ramvec_initialize.c
index f9c6f172b85..592732b106f 100644
--- a/arch/arm/src/armv7-m/arm_ramvec_initialize.c
+++ b/arch/arm/src/armv7-m/arm_ramvec_initialize.c
@@ -86,7 +86,7 @@
  ****************************************************************************/
 
 /* If CONFIG_ARCH_RAMVECTORS is defined, then the ARM logic must provide
- * ARM-specific implementations of up_ramvec_initialize(), irq_attach(), and
+ * ARM-specific implementations of arm_ramvec_initialize(), irq_attach(), and
  * irq_dispatch.  In this case, it is also assumed that the ARM vector
  * table resides in RAM, has the name g_ram_vectors, and has been
  * properly positioned and aligned in memory by the linker script.
@@ -105,14 +105,14 @@ up_vector_t g_ram_vectors[ARMV7M_VECTAB_SIZE]
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_ramvec_initialize
+ * Name: arm_ramvec_initialize
  *
  * Description:
  *   Copy vectors to RAM an configure the NVIC to use the RAM vectors.
  *
  ****************************************************************************/
 
-void up_ramvec_initialize(void)
+void arm_ramvec_initialize(void)
 {
   const up_vector_t *src;
   up_vector_t *dest;
diff --git a/arch/arm/src/armv7-m/ram_vectors.h b/arch/arm/src/armv7-m/ram_vectors.h
index b92edb12ac4..b329d1eafc1 100644
--- a/arch/arm/src/armv7-m/ram_vectors.h
+++ b/arch/arm/src/armv7-m/ram_vectors.h
@@ -69,14 +69,14 @@ extern up_vector_t g_ram_vectors[ARMV7M_VECTAB_SIZE]
  ****************************************************************************/
 
 /****************************************************************************
- * Name: up_ramvec_initialize
+ * Name: arm_ramvec_initialize
  *
  * Description:
  *   Copy vectors to RAM an configure the NVIC to use the RAM vectors.
  *
  ****************************************************************************/
 
-void up_ramvec_initialize(void);
+void arm_ramvec_initialize(void);
 
 /****************************************************************************
  * Name: exception_common
@@ -89,7 +89,7 @@ void up_ramvec_initialize(void);
 void exception_common(void);
 
 /****************************************************************************
- * Name: up_ramvec_attach
+ * Name: arm_ramvec_attach
  *
  * Description:
  *   Configure the ram vector table so that IRQ number 'irq' will be
@@ -97,7 +97,7 @@ void exception_common(void);
  *
  ****************************************************************************/
 
-int up_ramvec_attach(int irq, up_vector_t vector);
+int arm_ramvec_attach(int irq, up_vector_t vector);
 
 #endif /* CONFIG_ARCH_RAMVECTORS */
 #endif /* __ARCH_ARM_SRC_COMMON_ARMV7_M_RAM_VECTORS_H */
diff --git a/arch/arm/src/cxd56xx/cxd56_irq.c b/arch/arm/src/cxd56xx/cxd56_irq.c
index e776c23f871..8a562f659ba 100644
--- a/arch/arm/src/cxd56xx/cxd56_irq.c
+++ b/arch/arm/src/cxd56xx/cxd56_irq.c
@@ -319,7 +319,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/efm32/efm32_irq.c b/arch/arm/src/efm32/efm32_irq.c
index f85c63d9eaf..5caeb107e1f 100644
--- a/arch/arm/src/efm32/efm32_irq.c
+++ b/arch/arm/src/efm32/efm32_irq.c
@@ -334,7 +334,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/imxrt/imxrt_irq.c b/arch/arm/src/imxrt/imxrt_irq.c
index 4dbd7e91ba8..5647f88d264 100644
--- a/arch/arm/src/imxrt/imxrt_irq.c
+++ b/arch/arm/src/imxrt/imxrt_irq.c
@@ -429,7 +429,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c
index ccca756a87a..bfcb840ae81 100644
--- a/arch/arm/src/kinetis/kinetis_irq.c
+++ b/arch/arm/src/kinetis/kinetis_irq.c
@@ -369,7 +369,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/lc823450/lc823450_irq.c b/arch/arm/src/lc823450/lc823450_irq.c
index 5f0c23e7263..07d5e455140 100644
--- a/arch/arm/src/lc823450/lc823450_irq.c
+++ b/arch/arm/src/lc823450/lc823450_irq.c
@@ -493,7 +493,7 @@ void up_irqinitialize(void)
    */
 
 #if defined(CONFIG_ARCH_RAMVECTORS)
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #elif defined(CONFIG_LC823450_DFU)
   putreg32((uint32_t)_vectors, NVIC_VECTAB);
 #endif
diff --git a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
index fd27e4b8a85..50c0174c55a 100644
--- a/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
+++ b/arch/arm/src/lpc17xx_40xx/lpc17_40_irq.c
@@ -337,12 +337,12 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    *
    * But even in this case NVIC_VECTAB has to point to the initial table
-   * because up_ramvec_initialize() initializes RAM table from table
+   * because arm_ramvec_initialize() initializes RAM table from table
    * pointed by NVIC_VECTAB register.
    */
 
 #ifdef CONFIG_ARCH_RAMVECTORS
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/lpc43xx/lpc43_irq.c b/arch/arm/src/lpc43xx/lpc43_irq.c
index 91a0380eb8c..fcb9180b336 100644
--- a/arch/arm/src/lpc43xx/lpc43_irq.c
+++ b/arch/arm/src/lpc43xx/lpc43_irq.c
@@ -326,7 +326,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/lpc54xx/lpc54_irq.c b/arch/arm/src/lpc54xx/lpc54_irq.c
index 99c30184c54..d835e778a98 100644
--- a/arch/arm/src/lpc54xx/lpc54_irq.c
+++ b/arch/arm/src/lpc54xx/lpc54_irq.c
@@ -325,7 +325,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/max326xx/common/max326_irq.c b/arch/arm/src/max326xx/common/max326_irq.c
index ea08cb603fd..6ef9162821a 100644
--- a/arch/arm/src/max326xx/common/max326_irq.c
+++ b/arch/arm/src/max326xx/common/max326_irq.c
@@ -324,7 +324,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/nrf52/nrf52_irq.c b/arch/arm/src/nrf52/nrf52_irq.c
index f2a42d94749..4335e527e07 100644
--- a/arch/arm/src/nrf52/nrf52_irq.c
+++ b/arch/arm/src/nrf52/nrf52_irq.c
@@ -339,7 +339,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c b/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c
index 0da1e901dda..527f0723371 100644
--- a/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c
+++ b/arch/arm/src/s32k1xx/s32k14x/s32k14x_irq.c
@@ -346,7 +346,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c
index 74a6d3bd2f4..5534829dd6f 100644
--- a/arch/arm/src/sam34/sam_irq.c
+++ b/arch/arm/src/sam34/sam_irq.c
@@ -400,7 +400,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/samd5e5/sam_irq.c b/arch/arm/src/samd5e5/sam_irq.c
index 29278399750..71b69b30372 100644
--- a/arch/arm/src/samd5e5/sam_irq.c
+++ b/arch/arm/src/samd5e5/sam_irq.c
@@ -478,7 +478,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c
index a954c874be0..ad4608f2b43 100644
--- a/arch/arm/src/samv7/sam_irq.c
+++ b/arch/arm/src/samv7/sam_irq.c
@@ -396,7 +396,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/stm32/stm32_irq.c b/arch/arm/src/stm32/stm32_irq.c
index 24da0ccc603..223645471b0 100644
--- a/arch/arm/src/stm32/stm32_irq.c
+++ b/arch/arm/src/stm32/stm32_irq.c
@@ -330,7 +330,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c
index b172375cab4..a5fbb9f26a5 100644
--- a/arch/arm/src/stm32f7/stm32_irq.c
+++ b/arch/arm/src/stm32f7/stm32_irq.c
@@ -429,7 +429,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/stm32h7/stm32_irq.c b/arch/arm/src/stm32h7/stm32_irq.c
index 4bf95a3e403..290a714faa8 100644
--- a/arch/arm/src/stm32h7/stm32_irq.c
+++ b/arch/arm/src/stm32h7/stm32_irq.c
@@ -454,7 +454,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/stm32l4/stm32l4_irq.c b/arch/arm/src/stm32l4/stm32l4_irq.c
index d53e17a10ee..ffa3fcaa646 100644
--- a/arch/arm/src/stm32l4/stm32l4_irq.c
+++ b/arch/arm/src/stm32l4/stm32l4_irq.c
@@ -318,7 +318,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/arch/arm/src/tiva/common/tiva_irq.c b/arch/arm/src/tiva/common/tiva_irq.c
index 89364fa3032..dcfe619eac1 100644
--- a/arch/arm/src/tiva/common/tiva_irq.c
+++ b/arch/arm/src/tiva/common/tiva_irq.c
@@ -430,7 +430,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
 #ifdef CONFIG_TIVA_RAMVBAR
diff --git a/arch/arm/src/xmc4/xmc4_irq.c b/arch/arm/src/xmc4/xmc4_irq.c
index 55d5b6ba911..8f66232582e 100644
--- a/arch/arm/src/xmc4/xmc4_irq.c
+++ b/arch/arm/src/xmc4/xmc4_irq.c
@@ -368,7 +368,7 @@ void up_irqinitialize(void)
    * vector table that requires special initialization.
    */
 
-  up_ramvec_initialize();
+  arm_ramvec_initialize();
 #endif
 
   /* Set all interrupts (and exceptions) to the default priority */
diff --git a/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c b/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c
index 65aca97c90b..ef2a4de83be 100644
--- a/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c
+++ b/boards/arm/stm32/nucleo-f302r8/src/stm32_highpri.c
@@ -424,10 +424,10 @@ int highpri_main(int argc, char *argv[])
 #if !defined(CONFIG_STM32_ADC1_DMA) || defined(HIGHPRI_HAVE_INJECTED)
   /* Attach ADC12 ram vector if no DMA or injected channels support */
 
-  ret = up_ramvec_attach(STM32_IRQ_ADC12, adc12_handler);
+  ret = arm_ramvec_attach(STM32_IRQ_ADC12, adc12_handler);
   if (ret < 0)
     {
-      fprintf(stderr, "highpri_main: ERROR: up_ramvec_attach failed: %d\n",
+      fprintf(stderr, "highpri_main: ERROR: arm_ramvec_attach failed: %d\n",
               ret);
       ret = EXIT_FAILURE;
       goto errout;
@@ -450,10 +450,10 @@ int highpri_main(int argc, char *argv[])
 #ifdef CONFIG_STM32_ADC1_DMA
   /* Attach DMA1 CH1 ram vector if DMA */
 
-  ret = up_ramvec_attach(STM32_IRQ_DMA1CH1, dma1ch1_handler);
+  ret = arm_ramvec_attach(STM32_IRQ_DMA1CH1, dma1ch1_handler);
   if (ret < 0)
     {
-      fprintf(stderr, "highpri_main: ERROR: up_ramvec_attach failed: %d\n",
+      fprintf(stderr, "highpri_main: ERROR: arm_ramvec_attach failed: %d\n",
               ret);
       ret = EXIT_FAILURE;
       goto errout;
diff --git a/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c
index 3e3c8be9731..a357f43e92c 100644
--- a/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c
+++ b/boards/arm/stm32/nucleo-f334r8/src/stm32_highpri.c
@@ -460,10 +460,10 @@ int highpri_main(int argc, char *argv[])
 #if !defined(CONFIG_STM32_ADC1_DMA) || defined(HIGHPRI_HAVE_INJECTED)
   /* Attach ADC12 ram vector if no DMA or injected channels support */
 
-  ret = up_ramvec_attach(STM32_IRQ_ADC12, adc12_handler);
+  ret = arm_ramvec_attach(STM32_IRQ_ADC12, adc12_handler);
   if (ret < 0)
     {
-      fprintf(stderr, "highpri_main: ERROR: up_ramvec_attach failed: %d\n",
+      fprintf(stderr, "highpri_main: ERROR: arm_ramvec_attach failed: %d\n",
               ret);
       ret = EXIT_FAILURE;
       goto errout;
@@ -486,10 +486,10 @@ int highpri_main(int argc, char *argv[])
 #ifdef CONFIG_STM32_ADC1_DMA
   /* Attach DMA1 CH1 ram vector if DMA */
 
-  ret = up_ramvec_attach(STM32_IRQ_DMA1CH1, dma1ch1_handler);
+  ret = arm_ramvec_attach(STM32_IRQ_DMA1CH1, dma1ch1_handler);
   if (ret < 0)
     {
-      fprintf(stderr, "highpri_main: ERROR: up_ramvec_attach failed: %d\n",
+      fprintf(stderr, "highpri_main: ERROR: arm_ramvec_attach failed: %d\n",
               ret);
       ret = EXIT_FAILURE;
       goto errout;
diff --git a/boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c b/boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c
index 931da669729..f2f3305eb58 100644
--- a/boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c
+++ b/boards/arm/stm32/nucleo-f334r8/src/stm32_spwm.c
@@ -569,10 +569,10 @@ static int spwm_hrtim_setup(FAR struct spwm_s *spwm)
 
   /* Attach HRTIM Master TImer IRQ */
 
-  ret = up_ramvec_attach(STM32_IRQ_HRTIMTM, hrtim_master_handler);
+  ret = arm_ramvec_attach(STM32_IRQ_HRTIMTM, hrtim_master_handler);
   if (ret < 0)
     {
-      fprintf(stderr, "spwm_main: ERROR: up_ramvec_attach failed: %d\n",
+      fprintf(stderr, "spwm_main: ERROR: arm_ramvec_attach failed: %d\n",
               ret);
       ret = -1;
       goto errout;
@@ -777,10 +777,10 @@ static int spwm_tim6_setup(FAR struct spwm_s *spwm)
 
   /* Attach TIM6 ram vector */
 
-  ret = up_ramvec_attach(STM32_IRQ_TIM6, tim6_handler);
+  ret = arm_ramvec_attach(STM32_IRQ_TIM6, tim6_handler);
   if (ret < 0)
     {
-      printf("ERROR: up_ramvec_attach failed: %d\n", ret);
+      printf("ERROR: arm_ramvec_attach failed: %d\n", ret);
       ret = -1;
       goto errout;
     }
diff --git a/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c b/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c
index 062411fa7c3..8eb5c81b91a 100644
--- a/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c
+++ b/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c
@@ -1107,10 +1107,10 @@ int stm32_smps_setup(void)
 
       /* Attach ADC12 ram vector */
 
-      ret = up_ramvec_attach(STM32_IRQ_ADC12, adc12_handler);
+      ret = arm_ramvec_attach(STM32_IRQ_ADC12, adc12_handler);
       if (ret < 0)
         {
-          pwrerr("ERROR:  up_ramvec_attach failed: %d\n", ret);
+          pwrerr("ERROR:  arm_ramvec_attach failed: %d\n", ret);
           ret = EXIT_FAILURE;
           goto errout;
         }
diff --git a/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c b/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c
index cf0193c0475..ed2e8b4c2db 100644
--- a/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c
+++ b/boards/arm/stm32/stm32f429i-disco/src/stm32_highpri.c
@@ -409,10 +409,10 @@ int highpri_main(int argc, char *argv[])
 #if !defined(CONFIG_STM32_ADC1_DMA) || defined(HIGHPRI_HAVE_INJECTED)
   /* Attach ADC ram vector if no DMA or injected channels support */
 
-  ret = up_ramvec_attach(STM32_IRQ_ADC, adc_handler);
+  ret = arm_ramvec_attach(STM32_IRQ_ADC, adc_handler);
   if (ret < 0)
     {
-      fprintf(stderr, "highpri_main: ERROR: up_ramvec_attach failed: %d\n",
+      fprintf(stderr, "highpri_main: ERROR: arm_ramvec_attach failed: %d\n",
               ret);
       ret = EXIT_FAILURE;
       goto errout;
@@ -435,10 +435,10 @@ int highpri_main(int argc, char *argv[])
 #ifdef CONFIG_STM32_ADC1_DMA
   /* Attach DMA2 STREAM0 ram vector if DMA */
 
-  ret = up_ramvec_attach(STM32_IRQ_DMA2S0, dma2s0_handler);
+  ret = arm_ramvec_attach(STM32_IRQ_DMA2S0, dma2s0_handler);
   if (ret < 0)
     {
-      fprintf(stderr, "highpri_main: ERROR: up_ramvec_attach failed: %d\n",
+      fprintf(stderr, "highpri_main: ERROR: arm_ramvec_attach failed: %d\n",
               ret);
       ret = EXIT_FAILURE;
       goto errout;
diff --git a/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c b/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c
index 5eaa76b7565..0ff75074c51 100644
--- a/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c
+++ b/boards/arm/stm32/viewtool-stm32f107/src/stm32_highpri.c
@@ -199,10 +199,10 @@ int highpri_main(int argc, char *argv[])
 
   /* Attach TIM6 ram vector */
 
-  ret = up_ramvec_attach(STM32_IRQ_TIM6, tim6_handler);
+  ret = arm_ramvec_attach(STM32_IRQ_TIM6, tim6_handler);
   if (ret < 0)
     {
-      fprintf(stderr, "highpri_main: ERROR: up_ramvec_attach failed: %d\n", ret);
+      fprintf(stderr, "highpri_main: ERROR: arm_ramvec_attach failed: %d\n", ret);
       return EXIT_FAILURE;
     }
 
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spwm.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spwm.c
index 59ab5ea5387..3da6e1485d6 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spwm.c
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_spwm.c
@@ -395,10 +395,10 @@ static int spwm_tim6_setup(FAR struct spwm_s *spwm)
 
   /* Attach TIM6 ram vector */
 
-  ret = up_ramvec_attach(STM32L4_IRQ_TIM6, tim6_handler);
+  ret = arm_ramvec_attach(STM32L4_IRQ_TIM6, tim6_handler);
   if (ret < 0)
     {
-      printf("ERROR: up_ramvec_attach failed: %d\n", ret);
+      printf("ERROR: arm_ramvec_attach failed: %d\n", ret);
       ret = -1;
       goto errout;
     }