diff --git a/src/mainboard/amd/torpedo/get_bus_conf.c b/src/mainboard/amd/torpedo/get_bus_conf.c
index 5217321c07..2b4e9fa73a 100644
--- a/src/mainboard/amd/torpedo/get_bus_conf.c
+++ b/src/mainboard/amd/torpedo/get_bus_conf.c
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <cpu/amd/amdfam12.h>
-#include "SbEarly.h"
+#include "sb_cimx.h"
 #include "agesawrapper.h"
 
 /* Global variables for MB layouts and these will be shared by irqtable mptable
diff --git a/src/mainboard/amd/torpedo/romstage.c b/src/mainboard/amd/torpedo/romstage.c
index 109abadb2d..a2da0f011b 100644
--- a/src/mainboard/amd/torpedo/romstage.c
+++ b/src/mainboard/amd/torpedo/romstage.c
@@ -33,7 +33,7 @@
 #include "cpu/x86/lapic.h"
 #include "drivers/pc80/i8254.c"
 #include "drivers/pc80/i8259.c"
-#include "SbEarly.h"
+#include "sb_cimx.h"
 #include "SbPlatform.h"
 #include <arch/cpu.h>
 #include "platform_cfg.h"
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c
index 42b4b3de59..e6be598873 100644
--- a/src/northbridge/amd/agesa/family12/northbridge.c
+++ b/src/northbridge/amd/agesa/family12/northbridge.c
@@ -34,7 +34,7 @@
 #include <cpu/amd/mtrr.h>
 
 #include "northbridge.h"
-#include "SbEarly.h"
+#include "sb_cimx.h"
 #include "agesawrapper.h"
 
 //#define FX_DEVS NODE_NUMS
diff --git a/src/southbridge/amd/cimx/sb900/SbPlatform.h b/src/southbridge/amd/cimx/sb900/SbPlatform.h
index 36c186ab8a..5e419787ca 100644
--- a/src/southbridge/amd/cimx/sb900/SbPlatform.h
+++ b/src/southbridge/amd/cimx/sb900/SbPlatform.h
@@ -67,7 +67,7 @@ typedef union _PCI_ADDR {
 #include "AmdSbLib.h"
 #include "SbSubFun.h"
 #include "platform_cfg.h"	/* mainboard specific configuration */
-#include "Oem.h"		/* platform default configuration */
+#include "OEM.h"		/* platform default configuration */
 #include "AMD.h"
 #include "SbBiosRamUsage.h"
 #include "EcFan.h"
diff --git a/src/southbridge/amd/cimx/sb900/early.c b/src/southbridge/amd/cimx/sb900/early.c
index 198066fd03..237137f98b 100644
--- a/src/southbridge/amd/cimx/sb900/early.c
+++ b/src/southbridge/amd/cimx/sb900/early.c
@@ -24,7 +24,7 @@
 #include <device/pci_ids.h>
 #include <arch/io.h>
 #include "SbPlatform.h"
-#include "SbEarly.h"
+#include "sb_cimx.h"
 #include <console/console.h>
 #include <console/loglevel.h>
 #include "smbus.h"
diff --git a/src/southbridge/amd/cimx/sb900/SbEarly.h b/src/southbridge/amd/cimx/sb900/sb_cimx.h
similarity index 100%
rename from src/southbridge/amd/cimx/sb900/SbEarly.h
rename to src/southbridge/amd/cimx/sb900/sb_cimx.h
diff --git a/src/vendorcode/amd/agesa/f12/Proc/Fch/FchPlatform.h b/src/vendorcode/amd/agesa/f12/Proc/Fch/FchPlatform.h
index a8ff2f2633..0561d3da07 100644
--- a/src/vendorcode/amd/agesa/f12/Proc/Fch/FchPlatform.h
+++ b/src/vendorcode/amd/agesa/f12/Proc/Fch/FchPlatform.h
@@ -108,7 +108,7 @@
 #include "FchCommonCfg.h"
 #include "AcpiLib.h"
 #include "FchDef.h"
-#include "Oem.h"
+#include "OEM.h"
 #include "FchBiosRamUsage.h"
 #include "AmdFch.h"
 
diff --git a/src/vendorcode/amd/cimx/sb900/Oem.h b/src/vendorcode/amd/cimx/sb900/OEM.h
similarity index 100%
rename from src/vendorcode/amd/cimx/sb900/Oem.h
rename to src/vendorcode/amd/cimx/sb900/OEM.h