diff --git a/configs/nucleo-l476rg/src/nucleo-l476rg.h b/configs/nucleo-l476rg/src/nucleo-l476rg.h
index e82283b177..a6f676da54 100644
--- a/configs/nucleo-l476rg/src/nucleo-l476rg.h
+++ b/configs/nucleo-l476rg/src/nucleo-l476rg.h
@@ -71,7 +71,7 @@
 #  undef HAVE_RTC_DRIVER
 #endif
 
-#if !defined(CONFIG_STM32_SDIO) || !defined(CONFIG_MMCSD) || \
+#if !defined(CONFIG_STM32L4_SDIO) || !defined(CONFIG_MMCSD) || \
     !defined(CONFIG_MMCSD_SDIO)
 #  undef HAVE_MMCSD
 #endif
@@ -293,10 +293,10 @@
 
 /* Global driver instances */
 
-#ifdef CONFIG_STM32_SPI1
+#ifdef CONFIG_STM32L4_SPI1
 extern struct spi_dev_s *g_spi1;
 #endif
-#ifdef CONFIG_STM32_SPI2
+#ifdef CONFIG_STM32L4_SPI2
 extern struct spi_dev_s *g_spi2;
 #endif
 #ifdef HAVE_MMCSD
@@ -308,27 +308,27 @@ extern struct sdio_dev_s *g_sdio;
  ************************************************************************************/
 
 /************************************************************************************
- * Name: stm32_spiinitialize
+ * Name: stm32l4_spiinitialize
  *
  * Description:
  *   Called to configure SPI chip select GPIO pins.
  *
  ************************************************************************************/
 
-void stm32_spiinitialize(void);
+void stm32l4_spiinitialize(void);
 
 /************************************************************************************
- * Name: stm32_usbinitialize
+ * Name: stm32l4_usbinitialize
  *
  * Description:
  *   Called to setup USB-related GPIO pins.
  *
  ************************************************************************************/
 
-void stm32_usbinitialize(void);
+void stm32l4_usbinitialize(void);
 
 /************************************************************************************
- * Name: stm32_pwm_setup
+ * Name: stm32l4_pwm_setup
  *
  * Description:
  *   Initialize PWM and register the PWM device.
@@ -336,11 +336,11 @@ void stm32_usbinitialize(void);
  ************************************************************************************/
 
 #ifdef CONFIG_PWM
-int stm32_pwm_setup(void);
+int stm32l4_pwm_setup(void);
 #endif
 
 /************************************************************************************
- * Name: stm32_adc_setup
+ * Name: stm32l4_adc_setup
  *
  * Description:
  *   Initialize ADC and register the ADC driver.
@@ -348,7 +348,7 @@ int stm32_pwm_setup(void);
  ************************************************************************************/
 
 #ifdef CONFIG_ADC
-int stm32_adc_setup(void);
+int stm32l4_adc_setup(void);
 #endif
 
 /****************************************************************************
diff --git a/configs/nucleo-l476rg/src/stm32_appinit.c b/configs/nucleo-l476rg/src/stm32_appinit.c
index 41b54976ae..ceaa3a76f5 100644
--- a/configs/nucleo-l476rg/src/stm32_appinit.c
+++ b/configs/nucleo-l476rg/src/stm32_appinit.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/nucleo-l476rg/src/stm32_appinit.c
+ * configs/nucleo-l476rg/src/stm32l4_appinit.c
  *
  *   Copyright (C) 2016 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -199,20 +199,20 @@ int board_app_initialize(uintptr_t arg)
 #ifdef CONFIG_PWM
   /* Initialize PWM and register the PWM device. */
 
-  ret = stm32_pwm_setup();
+  ret = stm32l4_pwm_setup();
   if (ret < 0)
     {
-      syslog(LOG_ERR, "ERROR: stm32_pwm_setup() failed: %d\n", ret);
+      syslog(LOG_ERR, "ERROR: stm32l4_pwm_setup() failed: %d\n", ret);
     }
 #endif
 
 #ifdef CONFIG_ADC
   /* Initialize ADC and register the ADC driver. */
 
-  ret = stm32_adc_setup();
+  ret = stm32l4_adc_setup();
   if (ret < 0)
     {
-      syslog(LOG_ERR, "ERROR: stm32_adc_setup failed: %d\n", ret);
+      syslog(LOG_ERR, "ERROR: stm32l4_adc_setup failed: %d\n", ret);
     }
 #endif
 
diff --git a/configs/nucleo-l476rg/src/stm32_boot.c b/configs/nucleo-l476rg/src/stm32_boot.c
index 0389d18cf1..2acb52ee62 100644
--- a/configs/nucleo-l476rg/src/stm32_boot.c
+++ b/configs/nucleo-l476rg/src/stm32_boot.c
@@ -1,5 +1,5 @@
 /************************************************************************************
- * configs/nucleo-l476rg/src/stm32_boot.c
+ * configs/nucleo-l476rg/src/stm32l4_boot.c
  *
  *   Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
@@ -82,19 +82,19 @@ void stm32l4_boardinitialize(void)
 #endif
 
   /* Configure SPI chip selects if 1) SP2 is not disabled, and 2) the weak function
-   * stm32_spiinitialize() has been brought into the link.
+   * stm32l4_spiinitialize() has been brought into the link.
    */
 
-#if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)
+#if defined(CONFIG_STM32L4_SPI1) || defined(CONFIG_STM32L4_SPI2) || defined(CONFIG_STM32L4_SPI3)
   stm32l4_spiinitialize();
 #endif
 
   /* Initialize USB is 1) USBDEV is selected, 2) the USB controller is not
-   * disabled, and 3) the weak function stm32_usbinitialize() has been brought
+   * disabled, and 3) the weak function stm32l4_usbinitialize() has been brought
    * into the build.
    */
 
-#if defined(CONFIG_USBDEV) && defined(CONFIG_STM32_USB)
+#if defined(CONFIG_USBDEV) && defined(CONFIG_STM32L4_USB)
   stm32l4_usbinitialize();
 #endif
 }