diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot.c b/arch/arm/src/stm32l4/stm32l4_oneshot.c
index 3abb44e862c..221f023155d 100644
--- a/arch/arm/src/stm32l4/stm32l4_oneshot.c
+++ b/arch/arm/src/stm32l4/stm32l4_oneshot.c
@@ -65,7 +65,7 @@ static struct stm32l4_oneshot_s *g_oneshot;
  ****************************************************************************/
 
 /****************************************************************************
- * Name: stm32_oneshot_handler
+ * Name: stm32l4_oneshot_handler
  *
  * Description:
  *   Timer interrupt callback.  When the oneshot timer interrupt expires,
@@ -83,7 +83,7 @@ static struct stm32l4_oneshot_s *g_oneshot;
  *
  ****************************************************************************/
 
-static int stm32_oneshot_handler(int irq, void *context)
+static int stm32l4_oneshot_handler(int irq, void *context)
 {
   struct stm32l4_oneshot_s *oneshot = g_oneshot;
   oneshot_handler_t oneshot_handler;
@@ -174,7 +174,7 @@ int stm32l4_oneshot_initialize(struct stm32l4_oneshot_s *oneshot, int chan,
 }
 
 /****************************************************************************
- * Name: stm32_oneshot_max_delay
+ * Name: stm32l4_oneshot_max_delay
  *
  * Description:
  *   Determine the maximum delay of the one-shot timer (in microseconds)
@@ -199,7 +199,7 @@ int stm32l4_oneshot_max_delay(struct stm32l4_oneshot_s *oneshot, uint64_t *usec)
  * Input Parameters:
  *   oneshot Caller allocated instance of the oneshot state structure.  This
  *           structure must have been previously initialized via a call to
- *           stm32_oneshot_initialize();
+ *           stm32l4_oneshot_initialize();
  *   handler The function to call when when the oneshot timer expires.
  *   arg     An opaque argument that will accompany the callback.
  *   ts      Provides the duration of the one shot timer.
@@ -259,7 +259,7 @@ int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot,
 
   /* Set up to receive the callback when the interrupt occurs */
 
-  STM32L4_TIM_SETISR(oneshot->tch, stm32_oneshot_handler, 0);
+  STM32L4_TIM_SETISR(oneshot->tch, stm32l4_oneshot_handler, 0);
 
   /* Set timer period */
 
@@ -294,7 +294,7 @@ int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot,
  * Input Parameters:
  *   oneshot Caller allocated instance of the oneshot state structure.  This
  *           structure must have been previously initialized via a call to
- *           stm32_oneshot_initialize();
+ *           stm32l4_oneshot_initialize();
  *   ts      The location in which to return the time remaining on the
  *           oneshot timer.  A time of zero is returned if the timer is
  *           not running.  ts may be zero in which case the time remaining
diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot.h b/arch/arm/src/stm32l4/stm32l4_oneshot.h
index 61117063217..743652bf49b 100644
--- a/arch/arm/src/stm32l4/stm32l4_oneshot.h
+++ b/arch/arm/src/stm32l4/stm32l4_oneshot.h
@@ -63,7 +63,7 @@
 typedef void (*oneshot_handler_t)(void *arg);
 
 /* The oneshot client must allocate an instance of this structure and called
- * stm32_oneshot_initialize() before using the oneshot facilities.  The client
+ * stm32l4_oneshot_initialize() before using the oneshot facilities.  The client
  * should not access the contents of this structure directly since the
  * contents are subject to change.
  */
@@ -139,7 +139,7 @@ int stm32l4_oneshot_max_delay(struct stm32l4_oneshot_s *oneshot, uint64_t *usec)
  * Input Parameters:
  *   oneshot Caller allocated instance of the oneshot state structure.  This
  *           structure must have been previously initialized via a call to
- *           stm32_oneshot_initialize();
+ *           stm32l4_oneshot_initialize();
  *   handler The function to call when when the oneshot timer expires.
  *   arg     An opaque argument that will accompany the callback.
  *   ts      Provides the duration of the one shot timer.
@@ -166,7 +166,7 @@ int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot,
  * Input Parameters:
  *   oneshot Caller allocated instance of the oneshot state structure.  This
  *           structure must have been previously initialized via a call to
- *           stm32_oneshot_initialize();
+ *           stm32l4_oneshot_initialize();
  *   ts      The location in which to return the time remaining on the
  *           oneshot timer.  A time of zero is returned if the timer is
  *           not running.