17 files changed, 11 insertions, 11 deletions
diff --git a/src/northbridge/via/cx700/Makefile.inc b/src/northbridge/via/cx700/Makefile.inc
index f67cc147a2..b833013790 100644
--- a/src/northbridge/via/cx700/Makefile.inc
+++ b/src/northbridge/via/cx700/Makefile.inc
@@ -17,10 +17,10 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-ramstage-y += cx700_reset.c
+ramstage-y += reset.c
 ramstage-y += northbridge.c
 
-driver-y += cx700_agp.c
-driver-y += cx700_lpc.c
-driver-y += cx700_sata.c
-driver-y += cx700_vga.c
+driver-y += agp.c
+driver-y += lpc.c
+driver-y += sata.c
+driver-y += vga.c
diff --git a/src/northbridge/via/cx700/cx700_agp.c b/src/northbridge/via/cx700/agp.c
index 0166ee135a..0166ee135a 100644
--- a/src/northbridge/via/cx700/cx700_agp.c
+++ b/src/northbridge/via/cx700/agp.c
diff --git a/src/northbridge/via/cx700/cx700_early_serial.c b/src/northbridge/via/cx700/early_serial.c
index 3f5020f670..3f5020f670 100644
--- a/src/northbridge/via/cx700/cx700_early_serial.c
+++ b/src/northbridge/via/cx700/early_serial.c
diff --git a/src/northbridge/via/cx700/cx700_early_smbus.c b/src/northbridge/via/cx700/early_smbus.c
index 4766e59a29..4766e59a29 100644
--- a/src/northbridge/via/cx700/cx700_early_smbus.c
+++ b/src/northbridge/via/cx700/early_smbus.c
diff --git a/src/northbridge/via/cx700/cx700_lpc.c b/src/northbridge/via/cx700/lpc.c
index 77ab97c145..77ab97c145 100644
--- a/src/northbridge/via/cx700/cx700_lpc.c
+++ b/src/northbridge/via/cx700/lpc.c
diff --git a/src/northbridge/via/cx700/raminit.c b/src/northbridge/via/cx700/raminit.c
index 5694ea31aa..d455768d96 100644
--- a/src/northbridge/via/cx700/raminit.c
+++ b/src/northbridge/via/cx700/raminit.c
@@ -21,7 +21,7 @@
 #include <spd.h>
 #include <spd_ddr2.h>
 #include <delay.h>
-#include "cx700_registers.h"
+#include "registers.h"
 
 /* Debugging macros. */
 #if CONFIG_DEBUG_RAM_SETUP
diff --git a/src/northbridge/via/cx700/cx700_registers.h b/src/northbridge/via/cx700/registers.h
index b63984f67f..b63984f67f 100644
--- a/src/northbridge/via/cx700/cx700_registers.h
+++ b/src/northbridge/via/cx700/registers.h
diff --git a/src/northbridge/via/cx700/cx700_reset.c b/src/northbridge/via/cx700/reset.c
index 83439881f6..83439881f6 100644
--- a/src/northbridge/via/cx700/cx700_reset.c
+++ b/src/northbridge/via/cx700/reset.c
diff --git a/src/northbridge/via/cx700/cx700_sata.c b/src/northbridge/via/cx700/sata.c
index 993b05ad0a..993b05ad0a 100644
--- a/src/northbridge/via/cx700/cx700_sata.c
+++ b/src/northbridge/via/cx700/sata.c
diff --git a/src/northbridge/via/cx700/cx700_usb.c b/src/northbridge/via/cx700/usb.c
index a85189477f..a85189477f 100644
--- a/src/northbridge/via/cx700/cx700_usb.c
+++ b/src/northbridge/via/cx700/usb.c
diff --git a/src/northbridge/via/cx700/cx700_vga.c b/src/northbridge/via/cx700/vga.c
index 8fd94c71ef..91dd8649e9 100644
--- a/src/northbridge/via/cx700/cx700_vga.c
+++ b/src/northbridge/via/cx700/vga.c
@@ -30,7 +30,7 @@
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/msr.h>
 #include <arch/interrupt.h>
-#include "cx700_registers.h"
+#include "registers.h"
 #include "chip.h"
 #include "northbridge.h"
 
diff --git a/src/northbridge/via/vx800/Makefile.inc b/src/northbridge/via/vx800/Makefile.inc
index de6c491ebe..670a3e9550 100644
--- a/src/northbridge/via/vx800/Makefile.inc
+++ b/src/northbridge/via/vx800/Makefile.inc
@@ -20,8 +20,8 @@
 
 driver-y += northbridge.c
 driver-y += vga.c
-driver-y += vx800_lpc.c
-driver-y += vx800_ide.c
+driver-y += lpc.c
+driver-y += ide.c
 
 chipset_bootblock_inc += $(src)/northbridge/via/vx800/romstrap.inc
 chipset_bootblock_lds += $(src)/northbridge/via/vx800/romstrap.lds
diff --git a/src/northbridge/via/vx800/vx800_early_serial.c b/src/northbridge/via/vx800/early_serial.c
index f46341ff15..f46341ff15 100644
--- a/src/northbridge/via/vx800/vx800_early_serial.c
+++ b/src/northbridge/via/vx800/early_serial.c
diff --git a/src/northbridge/via/vx800/vx800_early_smbus.c b/src/northbridge/via/vx800/early_smbus.c
index 421716cb6c..421716cb6c 100644
--- a/src/northbridge/via/vx800/vx800_early_smbus.c
+++ b/src/northbridge/via/vx800/early_smbus.c
diff --git a/src/northbridge/via/vx800/vx800_ide.c b/src/northbridge/via/vx800/ide.c
index 9fa8f35dbe..9fa8f35dbe 100644
--- a/src/northbridge/via/vx800/vx800_ide.c
+++ b/src/northbridge/via/vx800/ide.c
diff --git a/src/northbridge/via/vx800/vx800_lpc.c b/src/northbridge/via/vx800/lpc.c
index b9941d1270..b9941d1270 100644
--- a/src/northbridge/via/vx800/vx800_lpc.c
+++ b/src/northbridge/via/vx800/lpc.c
diff --git a/src/northbridge/via/vx800/raminit.c b/src/northbridge/via/vx800/raminit.c
index ce9b7d4fab..f039b025ff 100644
--- a/src/northbridge/via/vx800/raminit.c
+++ b/src/northbridge/via/vx800/raminit.c
@@ -35,8 +35,8 @@
 #endif
 #include "northbridge/via/vx800/translator_ddr2_init.c"
 #include "northbridge/via/vx800/dram_init.h"
-#include "northbridge/via/vx800/vx800_early_smbus.c"
-#include "northbridge/via/vx800/vx800_early_serial.c"
+#include "northbridge/via/vx800/early_smbus.c"
+#include "northbridge/via/vx800/early_serial.c"
 #include "northbridge/via/vx800/dram_util.h"
 #include "northbridge/via/vx800/dram_util.c"
 #include "northbridge/via/vx800/detection.c"