diff --git a/src/acpi/Makefile.inc b/src/acpi/Makefile.inc
index 09ff9f1e58..09b990603f 100644
--- a/src/acpi/Makefile.inc
+++ b/src/acpi/Makefile.inc
@@ -4,12 +4,11 @@
 ifeq ($(CONFIG_HAVE_ACPI_TABLES),y)
 
 ramstage-y += acpi.c
-ramstage-y += acpi_device.c
-ramstage-y += acpi_pld.c
 ramstage-y += acpigen.c
 ramstage-y += acpigen_dsm.c
 ramstage-y += acpigen_ps2_keybd.c
-
+ramstage-y += device.c
+ramstage-y += pld.c
 ramstage-y += sata.c
 
 ifneq ($(wildcard src/mainboard/$(MAINBOARDDIR)/acpi_tables.c),)
diff --git a/src/acpi/acpi_device.c b/src/acpi/device.c
similarity index 100%
rename from src/acpi/acpi_device.c
rename to src/acpi/device.c
diff --git a/src/acpi/acpi_pld.c b/src/acpi/pld.c
similarity index 100%
rename from src/acpi/acpi_pld.c
rename to src/acpi/pld.c