diff --git a/arch/x86/cachemain.c b/arch/x86/cachemain.c
index da7ab9133d..f1d8da8daf 100644
--- a/arch/x86/cachemain.c
+++ b/arch/x86/cachemain.c
@@ -29,7 +29,7 @@
 void uart_init(void);
 void die(const char *msg);
 int find_file(struct mem_file *archive, char *filename, struct mem_file *result);
-void early_init(void);
+void hardware_stage1(void);
 
 // Is this value correct?
 #define DCACHE_RAM_SIZE 0x8000
@@ -82,7 +82,7 @@ void stage1_main(u32 bist)
 	// We have cache as ram running and can start executing code in C.
 	//
 	
-	early_init();
+	hardware_stage1();
 
 	//
 	uart_init();	// initialize serial port
diff --git a/arch/x86/geodelx/early_init.c b/arch/x86/geodelx/stage1.c
similarity index 100%
rename from arch/x86/geodelx/early_init.c
rename to arch/x86/geodelx/stage1.c
diff --git a/mainboard/adl/msm800sev/Makefile b/mainboard/adl/msm800sev/Makefile
index f7b05a5383..0831755026 100644
--- a/mainboard/adl/msm800sev/Makefile
+++ b/mainboard/adl/msm800sev/Makefile
@@ -19,11 +19,11 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
-STAGE0_MAINBOARD_OBJ := $(obj)/superio/winbond/w83627hf/w83627hf_early_serial.o \
+STAGE0_MAINBOARD_OBJ := $(obj)/superio/winbond/w83627hf/stage1.o \
 		$(obj)/device/pnp_raw.o \
-		$(obj)/southbridge/amd/cs5536/cs5536_early_setup.o\
-		$(obj)/arch/x86/geodelx/early_init.o \
-		$(obj)/mainboard/$(MAINBOARDDIR)/early_init.o
+		$(obj)/southbridge/amd/cs5536/stage1.o\
+		$(obj)/arch/x86/geodelx/stage1.o \
+		$(obj)/mainboard/$(MAINBOARDDIR)/stage1.o
 
 $(obj)/linuxbios.vpd:
 	$(Q)printf "  BUILD   DUMMY VPD\n"
diff --git a/mainboard/adl/msm800sev/early_init.c b/mainboard/adl/msm800sev/stage1.c
similarity index 97%
rename from mainboard/adl/msm800sev/early_init.c
rename to mainboard/adl/msm800sev/stage1.c
index 52307e5a2a..102a84a25c 100644
--- a/mainboard/adl/msm800sev/early_init.c
+++ b/mainboard/adl/msm800sev/stage1.c
@@ -35,14 +35,14 @@
 
 #define SERIAL_DEV 0x30
 
-int early_init(void)
+int hardware_stage1(void)
 {
 	void w83627hf_enable_serial(u8 dev, u8 serial, u16 iobase);
 	post_code(POST_START_OF_MAIN);
 
 	geodelx_msr_init();
 
-	cs5536_early_setup();
+	cs5536_stage1();
 
 	/* NOTE: must do this AFTER the early_setup!
 	 * it is counting on some early MSR setup
diff --git a/southbridge/amd/cs5536/cs5536.h b/southbridge/amd/cs5536/cs5536.h
index 2a50753b62..808b89a496 100644
--- a/southbridge/amd/cs5536/cs5536.h
+++ b/southbridge/amd/cs5536/cs5536.h
@@ -451,7 +451,7 @@ void cs5536_setup_smbus_gpio(void);
 void cs5536_disable_internal_uart(void);
 void cs5536_setup_cis_mode(void);
 void cs5536_setup_onchipuart(void);
-void cs5536_early_setup(void);
+void cs5536_stage1(void);
 
 
 #endif				/* SOUTHBRIDGE_AMD_CS5536_CS5536_H */
diff --git a/southbridge/amd/cs5536/cs5536_early_setup.c b/southbridge/amd/cs5536/stage1.c
similarity index 99%
rename from southbridge/amd/cs5536/cs5536_early_setup.c
rename to southbridge/amd/cs5536/stage1.c
index dc99aca4df..457e61f974 100644
--- a/southbridge/amd/cs5536/cs5536_early_setup.c
+++ b/southbridge/amd/cs5536/stage1.c
@@ -274,7 +274,7 @@ void cs5536_setup_onchipuart(void)
  * See also a comment from Marc Jones:
  * http://www.linuxbios.org/pipermail/linuxbios/2007-June/021958.html
  */
-void cs5536_early_setup(void)
+void cs5536_stage1(void)
 {
 	struct msr  msr;
 
diff --git a/superio/winbond/w83627hf/w83627hf_early_serial.c b/superio/winbond/w83627hf/stage1.c
similarity index 100%
rename from superio/winbond/w83627hf/w83627hf_early_serial.c
rename to superio/winbond/w83627hf/stage1.c