diff --git a/arch/arm/src/stm32/stm32_exti_gpio.c b/arch/arm/src/stm32/stm32_exti_gpio.c
index cc61b2a1a0..2e882986ec 100644
--- a/arch/arm/src/stm32/stm32_exti_gpio.c
+++ b/arch/arm/src/stm32/stm32_exti_gpio.c
@@ -61,8 +61,8 @@
 
 struct gpio_callback_s
 {
-  xcptr_t callback;
-  void   *arg;
+  xcpt_t callback;
+  void  *arg;
 };
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32f7/stm32_exti_gpio.c b/arch/arm/src/stm32f7/stm32_exti_gpio.c
index 6bee1834a4..a4ec7a3d86 100644
--- a/arch/arm/src/stm32f7/stm32_exti_gpio.c
+++ b/arch/arm/src/stm32f7/stm32_exti_gpio.c
@@ -74,8 +74,8 @@
 
 struct gpio_callback_s
 {
-  xcptr_t callback;
-  void   *arg;
+  xcpt_t callback;
+  void  *arg;
 };
 
 /****************************************************************************
@@ -106,8 +106,8 @@ static int stm32_exti0_isr(int irq, void *context)
 
   if (g_gpio_callbacks[0].callback != NULL)
     {
-       xcptr_t callback = g_gpio_callbacks[0].callback;
-       void   *arg      = g_gpio_callbacks[0].arg;
+       xcpt_t callback = g_gpio_callbacks[0].callback;
+       void   *arg     = g_gpio_callbacks[0].arg;
 
       ret = callback(irq, context, arg);
     }
@@ -127,8 +127,8 @@ static int stm32_exti1_isr(int irq, void *context)
 
   if (g_gpio_callbacks[1].callback != NULL)
     {
-       xcptr_t callback = g_gpio_callbacks[1].callback;
-       void   *arg      = g_gpio_callbacks[1].arg;
+       xcpt_t callback = g_gpio_callbacks[1].callback;
+       void   *arg     = g_gpio_callbacks[1].arg;
 
       ret = callback(irq, context, arg);
     }
@@ -148,8 +148,8 @@ static int stm32_exti2_isr(int irq, void *context)
 
   if (g_gpio_callbacks[2].callback != NULL)
     {
-       xcptr_t callback = g_gpio_callbacks[2].callback;
-       void   *arg      = g_gpio_callbacks[2].arg;
+       xcpt_t callback = g_gpio_callbacks[2].callback;
+       void   *arg     = g_gpio_callbacks[2].arg;
 
       ret = callback(irq, context, arg);
     }
@@ -169,8 +169,8 @@ static int stm32_exti3_isr(int irq, void *context)
 
   if (g_gpio_callbacks[3].callback != NULL)
     {
-       xcptr_t callback = g_gpio_callbacks[3].callback;
-       void   *arg      = g_gpio_callbacks[3].arg;
+       xcpt_t callback = g_gpio_callbacks[3].callback;
+       void   *arg     = g_gpio_callbacks[3].arg;
 
       ret = callback(irq, context, arg);
     }
@@ -190,8 +190,8 @@ static int stm32_exti4_isr(int irq, void *context)
 
   if (g_gpio_callbacks[4].callback != NULL)
     {
-       xcptr_t callback = g_gpio_callbacks[4].callback;
-       void   *arg      = g_gpio_callbacks[4].arg;
+       xcpt_t callback = g_gpio_callbacks[4].callback;
+       void   *arg     = g_gpio_callbacks[4].arg;
 
       ret = callback(irq, context, arg);
     }
@@ -226,8 +226,8 @@ static int stm32_exti_multiisr(int irq, void *context, int first, int last)
 
           if (g_gpio_callbacks[pin].callback != NULL)
             {
-              xcptr_t callback = g_gpio_callbacks[pin].callback;
-              void   *arg      = g_gpio_callbacks[pin].arg;
+              xcpt_t callback = g_gpio_callbacks[pin].callback;
+              void   *arg     = g_gpio_callbacks[pin].arg;
               int tmp;
 
               tmp = callback(irq, context, arg);
diff --git a/arch/arm/src/stm32l4/stm32l4_exti_comp.c b/arch/arm/src/stm32l4/stm32l4_exti_comp.c
index bb25e5b096..b3aeb1e592 100644
--- a/arch/arm/src/stm32l4/stm32l4_exti_comp.c
+++ b/arch/arm/src/stm32l4/stm32l4_exti_comp.c
@@ -53,7 +53,7 @@
 
 struct comp_callback_s
 {
-  xcptr_t callback;
+  xcpt_t callback;
   void   *arg;
 };
 
diff --git a/arch/arm/src/stm32l4/stm32l4_exti_gpio.c b/arch/arm/src/stm32l4/stm32l4_exti_gpio.c
index 298237fbfd..c41fc7a8e6 100644
--- a/arch/arm/src/stm32l4/stm32l4_exti_gpio.c
+++ b/arch/arm/src/stm32l4/stm32l4_exti_gpio.c
@@ -61,7 +61,7 @@
 
 struct gpio_callback_s
 {
-  xcptr_t callback;
+  xcpt_t callback;
   void   *arg;
 };