diff --git a/configs/fire-stm32v2/src/Makefile b/configs/fire-stm32v2/src/Makefile
index 7f5eaf7d61..d4b4aa548d 100644
--- a/configs/fire-stm32v2/src/Makefile
+++ b/configs/fire-stm32v2/src/Makefile
@@ -43,7 +43,7 @@ AOBJS = $(ASRCS:.S=$(OBJEXT))
 CSRCS = stm32_boot.c stm32_spi.c stm32_usbdev.c stm32_mmcsd.c
 
 ifeq ($(CONFIG_STM32_FSMC),y)
-CSRCS += up_lcd.c stm32_selectlcd.c
+CSRCS += stm32_lcd.c stm32_selectlcd.c
 endif
 
 ifeq ($(CONFIG_HAVE_CXX),y)
diff --git a/configs/lpc4330-xplorer/src/Makefile b/configs/lpc4330-xplorer/src/Makefile
index 40e3ecddc6..ece3720647 100644
--- a/configs/lpc4330-xplorer/src/Makefile
+++ b/configs/lpc4330-xplorer/src/Makefile
@@ -59,7 +59,7 @@ CSRCS += lpc43_buttons.c
 endif
 
 ifeq ($(CONFIG_USBMSC),y)
-CSRCS += up_usbmsc.c
+CSRCS += lpc43_usbmsc.c
 endif
 
 ifeq ($(CONFIG_SPIFI_LIBRARY),y)
diff --git a/configs/micropendous3/src/Makefile b/configs/micropendous3/src/Makefile
index 3fa16210d4..4e3743ff98 100644
--- a/configs/micropendous3/src/Makefile
+++ b/configs/micropendous3/src/Makefile
@@ -39,7 +39,7 @@ ASRCS =
 CSRCS = at90usb_boot.c
 
 ifeq ($(CONFIG_ARCH_LEDS),y)
-CSRCS += up_leds.c
+CSRCS += at90usb_leds.c
 endif
 
 AOBJS = $(ASRCS:.S=$(OBJEXT))
diff --git a/configs/mx1ads/src/Makefile b/configs/mx1ads/src/Makefile
index facf1cf9fc..db0ffb0f10 100644
--- a/configs/mx1ads/src/Makefile
+++ b/configs/mx1ads/src/Makefile
@@ -39,7 +39,7 @@ CFLAGS += -I$(TOPDIR)/sched
 
 ASRCS =
 AOBJS = $(ASRCS:.S=$(OBJEXT))
-CSRCS = up_boot.c up_leds.c up_network.c
+CSRCS = mx1_boot.c mx1_leds.c mx1_network.c
 COBJS = $(CSRCS:.c=$(OBJEXT))
 
 SRCS = $(ASRCS) $(CSRCS)
diff --git a/configs/stm32ldiscovery/src/Makefile b/configs/stm32ldiscovery/src/Makefile
index dae2164143..483ad79f26 100644
--- a/configs/stm32ldiscovery/src/Makefile
+++ b/configs/stm32ldiscovery/src/Makefile
@@ -61,15 +61,15 @@ CSRCS += stm32_lcd.c
 endif
 
 ifeq ($(CONFIG_PWM),y)
-CSRCS += up_pwm.c
+CSRCS += stm32_pwm.c
 endif
 
 ifeq ($(CONFIG_QENCODER),y)
-CSRCS += up_qencoder.c
+CSRCS += stm32_qencoder.c
 endif
 
 ifeq ($(CONFIG_WATCHDOG),y)
-CSRCS += up_watchdog.c
+CSRCS += stm32_watchdog.c
 endif
 
 ifeq ($(CONFIG_NSH_ARCHINIT),y)