8 files changed, 4 insertions, 4 deletions
diff --git a/src/northbridge/amd/amdfam10/Makefile.inc b/src/northbridge/amd/amdfam10/Makefile.inc
index 05e66d6f2d..2ab9c0fb16 100644
--- a/src/northbridge/amd/amdfam10/Makefile.inc
+++ b/src/northbridge/amd/amdfam10/Makefile.inc
@@ -1,7 +1,7 @@
 driver-y += northbridge.c
 driver-y += misc_control.c
 
-ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += amdfam10_acpi.c
+ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += acpi.c
 ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += ssdt.asl
 ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr1.asl
 ramstage-$(CONFIG_GENERATE_ACPI_TABLES) += sspr2.asl
diff --git a/src/northbridge/amd/amdfam10/amdfam10_acpi.c b/src/northbridge/amd/amdfam10/acpi.c
index 7e57cce0ab..7e57cce0ab 100644
--- a/src/northbridge/amd/amdfam10/amdfam10_acpi.c
+++ b/src/northbridge/amd/amdfam10/acpi.c
diff --git a/src/northbridge/amd/amdfam10/amdfam10.h b/src/northbridge/amd/amdfam10/amdfam10.h
index b1eaecd049..0f9295e8bb 100644
--- a/src/northbridge/amd/amdfam10/amdfam10.h
+++ b/src/northbridge/amd/amdfam10/amdfam10.h
@@ -964,7 +964,7 @@ that are corresponding to 0x01, 0x02, 0x03, 0x05, 0x06, 0x07
 #define F10_APSTATE_STOPPED 0x14  // allow AP to stop
 #define F10_APSTATE_RESET   0x01  // waiting for warm reset
 
-#include "amdfam10_nums.h"
+#include "nums.h"
 
 #ifdef __PRE_RAM__
 #if NODE_NUMS==64
diff --git a/src/northbridge/amd/amdfam10/amdfam10_conf.c b/src/northbridge/amd/amdfam10/conf.c
index adfff0f6e3..adfff0f6e3 100644
--- a/src/northbridge/amd/amdfam10/amdfam10_conf.c
+++ b/src/northbridge/amd/amdfam10/conf.c
diff --git a/src/northbridge/amd/amdfam10/debug.c b/src/northbridge/amd/amdfam10/debug.c
index df4c079bbe..2dc54275fd 100644
--- a/src/northbridge/amd/amdfam10/debug.c
+++ b/src/northbridge/amd/amdfam10/debug.c
@@ -21,7 +21,7 @@
  * Generic FAM10 debug code, used by mainboard specific romstage.c
  */
 
-#include "amdfam10_pci.c"
+#include "pci.c"
 #include <delay.h>
 
 static inline void print_debug_addr(const char *str, void *val)
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index d317b51148..b3e99ec441 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -124,7 +124,7 @@ static u32 amdfam10_nodeid(device_t dev)
 #endif
 }
 
-#include "amdfam10_conf.c"
+#include "conf.c"
 
 static void set_vga_enable_reg(u32 nodeid, u32 linkn)
 {
diff --git a/src/northbridge/amd/amdfam10/amdfam10_nums.h b/src/northbridge/amd/amdfam10/nums.h
index ba3666659c..ba3666659c 100644
--- a/src/northbridge/amd/amdfam10/amdfam10_nums.h
+++ b/src/northbridge/amd/amdfam10/nums.h
diff --git a/src/northbridge/amd/amdfam10/amdfam10_pci.c b/src/northbridge/amd/amdfam10/pci.c
index d08a9718c7..d08a9718c7 100644
--- a/src/northbridge/amd/amdfam10/amdfam10_pci.c
+++ b/src/northbridge/amd/amdfam10/pci.c