diff --git a/src/emu/cpu/i386/i386.c b/src/emu/cpu/i386/i386.c
index 6143b1536a2..2abbee06d7c 100644
--- a/src/emu/cpu/i386/i386.c
+++ b/src/emu/cpu/i386/i386.c
@@ -491,7 +491,7 @@ static STATE_POSTLOAD( i386_postload )
 	CHANGE_PC(I.eip);
 }
 
-static CPU_INIT( i386 )
+static CPU_INIT( _i386 )
 {
 	int i, j;
 	static const int regs8[8] = {AL,CL,DL,BL,AH,CH,DH,BH};
@@ -610,7 +610,7 @@ static void build_opcode_table(UINT32 features)
 	}
 }
 
-static CPU_RESET( i386 )
+static CPU_RESET( _i386 )
 {
 	cpu_irq_callback save_irqcallback;
 	const device_config *save_device;
@@ -695,7 +695,7 @@ static void i386_set_a20_line(int state)
 	}
 }
 
-static CPU_EXECUTE( i386 )
+static CPU_EXECUTE( _i386 )
 {
 	I.cycles = cycles;
 	I.base_cycles = cycles;
@@ -959,9 +959,9 @@ void i386_get_info(UINT32 state, cpuinfo *info)
 		case CPUINFO_PTR_SET_INFO:	      				info->setinfo = i386_set_info;			break;
 		case CPUINFO_PTR_GET_CONTEXT:					info->getcontext = i386_get_context;	break;
 		case CPUINFO_PTR_SET_CONTEXT:					info->setcontext = i386_set_context;	break;
-		case CPUINFO_PTR_INIT:		      				info->init = CPU_INIT_NAME(i386);					break;
-		case CPUINFO_PTR_RESET:		      				info->reset = CPU_RESET_NAME(i386);				break;
-		case CPUINFO_PTR_EXECUTE:	      				info->execute = CPU_EXECUTE_NAME(i386);			break;
+		case CPUINFO_PTR_INIT:		      				info->init = CPU_INIT_NAME(_i386);					break;
+		case CPUINFO_PTR_RESET:		      				info->reset = CPU_RESET_NAME(_i386);				break;
+		case CPUINFO_PTR_EXECUTE:	      				info->execute = CPU_EXECUTE_NAME(_i386);			break;
 		case CPUINFO_PTR_BURN:		      				info->burn = NULL;						break;
 		case CPUINFO_PTR_INSTRUCTION_COUNTER: 			info->icount = &I.cycles;				break;
 		case CPUINFO_PTR_TRANSLATE:						info->translate = translate_address_cb;	break;
@@ -1065,7 +1065,7 @@ void i386_get_info(UINT32 state, cpuinfo *info)
 
 static CPU_INIT( i486 )
 {
-	CPU_INIT_CALL(i386);
+	CPU_INIT_CALL(_i386);
 }
 
 static CPU_RESET( i486 )
@@ -1175,7 +1175,7 @@ void i486_get_info(UINT32 state, cpuinfo *info)
 
 static CPU_INIT( pentium )
 {
-	CPU_INIT_CALL(i386);
+	CPU_INIT_CALL(_i386);
 }
 
 static CPU_RESET( pentium )
@@ -1305,7 +1305,7 @@ void pentium_get_info(UINT32 state, cpuinfo *info)
 
 static CPU_INIT( mediagx )
 {
-	CPU_INIT_CALL(i386);
+	CPU_INIT_CALL(_i386);
 }
 
 static CPU_RESET( mediagx )