diff --git a/arch/arm/src/stm32/stm32_oneshot.c b/arch/arm/src/stm32/stm32_oneshot.c
index 598eb7e6f5a..437d80a9994 100644
--- a/arch/arm/src/stm32/stm32_oneshot.c
+++ b/arch/arm/src/stm32/stm32_oneshot.c
@@ -100,9 +100,9 @@ static int stm32_oneshot_handler(int irg_num, void * context, void *arg)
    */
 
   STM32_TIM_SETISR(oneshot->tch, NULL, NULL, 0);
-  STM32_TIM_DISABLEINT(oneshot->tch, ATIM_DIER_UIE);
+  STM32_TIM_DISABLEINT(oneshot->tch, GTIM_DIER_UIE);
   STM32_TIM_SETMODE(oneshot->tch, STM32_TIM_MODE_DISABLED);
-  STM32_TIM_ACKINT(oneshot->tch, ATIM_SR_UIF);
+  STM32_TIM_ACKINT(oneshot->tch, GTIM_SR_UIF);
 
   /* The timer is no longer running */
 
@@ -326,8 +326,8 @@ int stm32_oneshot_start(struct stm32_oneshot_s *oneshot,
 
   STM32_TIM_SETMODE(oneshot->tch, STM32_TIM_MODE_PULSE);
 
-  STM32_TIM_ACKINT(oneshot->tch, ATIM_SR_UIF);
-  STM32_TIM_ENABLEINT(oneshot->tch, ATIM_DIER_UIE);
+  STM32_TIM_ACKINT(oneshot->tch, GTIM_SR_UIF);
+  STM32_TIM_ENABLEINT(oneshot->tch, GTIM_DIER_UIE);
 
   /* Enable interrupts.  We should get the callback when the interrupt
    * occurs.
@@ -407,7 +407,7 @@ int stm32_oneshot_cancel(struct stm32_oneshot_s *oneshot,
 
   /* Now we can disable the interrupt and stop the timer. */
 
-  STM32_TIM_DISABLEINT(oneshot->tch, 0);
+  STM32_TIM_DISABLEINT(oneshot->tch, GTIM_DIER_UIE);
   STM32_TIM_SETISR(oneshot->tch, NULL, NULL, 0);
   STM32_TIM_SETMODE(oneshot->tch, STM32_TIM_MODE_DISABLED);
 
diff --git a/configs/maple/src/stm32_lcd.c b/configs/maple/src/stm32_lcd.c
index 47bc86aef24..c9942fd23b2 100644
--- a/configs/maple/src/stm32_lcd.c
+++ b/configs/maple/src/stm32_lcd.c
@@ -86,7 +86,7 @@ static int up_lcdextcominisr(int irq, void *context, void *arg)
   if (g_isr == NULL)
     {
       lcderr("ERROR: error, irq not attached, disabled\n");
-      STM32_TIM_DISABLEINT(tim, 0);
+      STM32_TIM_DISABLEINT(tim, ATIM_DIER_UIE);
       return OK;
     }
 
diff --git a/configs/viewtool-stm32f107/src/stm32_highpri.c b/configs/viewtool-stm32f107/src/stm32_highpri.c
index 19a9b4ac66a..b4294be27b4 100644
--- a/configs/viewtool-stm32f107/src/stm32_highpri.c
+++ b/configs/viewtool-stm32f107/src/stm32_highpri.c
@@ -218,7 +218,7 @@ int highpri_main(int argc, char *argv[])
   /* Enable the timer interrupt at the NVIC and at TIM6 */
 
   up_enable_irq(STM32_IRQ_TIM6);
-  STM32_TIM_ENABLEINT(dev, ATIM_SR_UIF);
+  STM32_TIM_ENABLEINT(dev, ATIM_DIER_UIE);
 
   /* Monitor interrupts */