diff --git a/ef/Runtime/System/md/x86/Makefile b/ef/Runtime/System/md/x86/Makefile
index 0429456a3bc0..931a5cb729e1 100644
--- a/ef/Runtime/System/md/x86/Makefile
+++ b/ef/Runtime/System/md/x86/Makefile
@@ -29,8 +29,8 @@ CPPSRCS = 	x86ExceptionHandler.cpp					\
 		x86SysCallsRuntime.cpp					\
 		$(NULL)
 
-LOCAL_MD_EXPORTS_x86 =  x86SysCallsRuntime.h			\
-			x86Win32ExceptionHandler.h		\
+LOCAL_MD_EXPORTS_x86 =  x86SysCallsRuntime.h		\
+			x86ExceptionHandler.h		\
 			$(NULL)
 
 MODULE_NAME = EF
diff --git a/ef/Runtime/System/md/x86/Win32ExceptionHandler.cpp b/ef/Runtime/System/md/x86/Win32ExceptionHandler.cpp
index 791b7f53df6a..bcc3c0422f2f 100644
--- a/ef/Runtime/System/md/x86/Win32ExceptionHandler.cpp
+++ b/ef/Runtime/System/md/x86/Win32ExceptionHandler.cpp
@@ -37,7 +37,7 @@
 #include "NativeCodeCache.h"
 #include "LogModule.h"
 
-#include "x86Win32ExceptionHandler.h"
+#include "x86ExceptionHandler.h"
 
 // declarations
 extern "C" SYSCALL_FUNC(void) x86SoftwareExceptionHandler(Uint32 EBP, Uint32 EDI, Uint32 ESI, Uint32 EBX, const JavaObject& inObject);
diff --git a/ef/Runtime/System/md/x86/x86ExceptionHandler.cpp b/ef/Runtime/System/md/x86/x86ExceptionHandler.cpp
index e18c81d4673f..e2da77ab1592 100644
--- a/ef/Runtime/System/md/x86/x86ExceptionHandler.cpp
+++ b/ef/Runtime/System/md/x86/x86ExceptionHandler.cpp
@@ -26,12 +26,12 @@
 
 #include "SysCalls.h"
 #include "prprf.h"
-#include "x86Win32ExceptionHandler.h"
+#include "x86ExceptionHandler.h"
 #include "ExceptionTable.h"
 #include "NativeCodeCache.h"
 #include "LogModule.h"
 
-UT_DEFINE_LOG_MODULE(Win32ExceptionHandler);
+UT_DEFINE_LOG_MODULE(x86ExceptionHandler);
 UT_DEFINE_LOG_MODULE(ExceptionRegs);
 
 extern "C" SYSCALL_FUNC(void) x86JumpToHandler(const JavaObject* inObject, Uint8* handler, Uint32 EBX, Uint32 ESI, Uint32 EDI, Uint32* EBP, Uint32* ESP);
@@ -139,7 +139,7 @@ extern "C" SYSCALL_FUNC(void) x86SoftwareExceptionHandler(Uint32 inEBP, Uint32 i
 	context.restoreESP = (Uint32*) ((Uint8*)context.sucessorEBP + 12);
 
 	// now that the context struct is filled we can print debugging information
-	DEBUG_LOG_ONLY(printExceptionBegin(UT_LOG_MODULE(Win32ExceptionHandler), &context));	
+	DEBUG_LOG_ONLY(printExceptionBegin(UT_LOG_MODULE(x86ExceptionHandler), &context));	
 
 	// find the exception handler
 	Uint8* handler = findExceptionHandler(&context);
@@ -147,7 +147,7 @@ extern "C" SYSCALL_FUNC(void) x86SoftwareExceptionHandler(Uint32 inEBP, Uint32 i
 	// jump to it
 	UT_LOG(ExceptionRegs, PR_LOG_DEBUG, ("Exit:  "));
 	DEBUG_LOG_ONLY(printRegs(UT_LOG_MODULE(ExceptionRegs), &context));
-	UT_LOG(Win32ExceptionHandler, PR_LOG_DEBUG, ("\n===============================\n\n"));
+	UT_LOG(x86ExceptionHandler, PR_LOG_DEBUG, ("\n===============================\n\n"));
 	assert(handler);
 	x86JumpToHandler(context.object, handler, context.EBX, context.ESI, context.EDI, context.sourceEBP, context.restoreESP);	
 }
@@ -230,7 +230,7 @@ bool x86PopStackFrame(Context* context)
 		context->restoreESP = NULL;
 	}
 
-	DEBUG_LOG_ONLY(printContext(UT_LOG_MODULE(Win32ExceptionHandler), context));
+	DEBUG_LOG_ONLY(printContext(UT_LOG_MODULE(x86ExceptionHandler), context));
 	DEBUG_ONLY(checkForNativeStub(context));
 	return true;
 }
@@ -253,7 +253,7 @@ bool isGuardFrame(Context* context, bool printIdentifier = false)
 		if( ((Uint32)(sysInvokeNativeStubs[i]) + 9 + 5 * i) == retAddress)
 		{
 			if(printIdentifier)
-				UT_LOG(Win32ExceptionHandler, PR_LOG_DEBUG, ("Guard Frame (made by sysInvokeNative%d())\n", i));
+				UT_LOG(x86ExceptionHandler, PR_LOG_DEBUG, ("Guard Frame (made by sysInvokeNative%d())\n", i));
 			return true;
 		}
 	// check other stubs
@@ -261,7 +261,7 @@ bool isGuardFrame(Context* context, bool printIdentifier = false)
 		if( ((Uint32)(sysInvokeNativeStubs[i]) + 23) == retAddress)
 		{
 			if(printIdentifier)
-				UT_LOG(Win32ExceptionHandler, PR_LOG_DEBUG, ("Guard Frame (made by sysInvokeNative(%d))\n", i));
+				UT_LOG(x86ExceptionHandler, PR_LOG_DEBUG, ("Guard Frame (made by sysInvokeNative(%d))\n", i));
 			return true;
 		}
 
@@ -269,7 +269,7 @@ bool isGuardFrame(Context* context, bool printIdentifier = false)
 	if((Uint32)compileStubReEntryPoint == retAddress)
 	{
 		if(printIdentifier)
-			UT_LOG(Win32ExceptionHandler, PR_LOG_DEBUG, ("Guard Frame (staticCompileStub)\n"));
+			UT_LOG(x86ExceptionHandler, PR_LOG_DEBUG, ("Guard Frame (staticCompileStub)\n"));
 		DEBUG_LOG_ONLY(PR_fprintf(PR_STDOUT,"WARNING: exception unwinding past a static compile stub\n"));
 		return true;
 	}
@@ -426,16 +426,16 @@ Uint8* findExceptionHandler(Context* context)
 		if (!x86PopStackFrame(context)) // when popStack() fails, we are faced with an uncaught exception
 		{
 			Uint8* uncaughtHandler = uncaughtExceptionExit(context);
-			UT_LOG(Win32ExceptionHandler, PR_LOG_DEBUG, ("\n-------------------------------\n"));
-			UT_LOG(Win32ExceptionHandler, PR_LOG_DEBUG, ("Uncaught Exception -- jumping to handler at 0x%p\n", uncaughtHandler));
+			UT_LOG(x86ExceptionHandler, PR_LOG_DEBUG, ("\n-------------------------------\n"));
+			UT_LOG(x86ExceptionHandler, PR_LOG_DEBUG, ("Uncaught Exception -- jumping to handler at 0x%p\n", uncaughtHandler));
 			return uncaughtHandler;
 		}
 	}
 
 	Uint8* pHandler = context->sourceCE->eTable->getStart()+ete->pHandler;
 	assert(pHandler);
-	UT_LOG(Win32ExceptionHandler, PR_LOG_DEBUG, ("\n-------------------------------\n"));
-	UT_LOG(Win32ExceptionHandler, PR_LOG_DEBUG, ("Matched to catch handler at %p\n\n", pHandler));
+	UT_LOG(x86ExceptionHandler, PR_LOG_DEBUG, ("\n-------------------------------\n"));
+	UT_LOG(x86ExceptionHandler, PR_LOG_DEBUG, ("Matched to catch handler at %p\n\n", pHandler));
 	assert(context->restoreESP != NULL);	// restore ESP must not be null, could mean that we are trying to return to a native method, NYI
 	return pHandler;
 }
diff --git a/ef/Runtime/System/md/x86/x86Win32ExceptionHandler.h b/ef/Runtime/System/md/x86/x86ExceptionHandler.h
similarity index 94%
rename from ef/Runtime/System/md/x86/x86Win32ExceptionHandler.h
rename to ef/Runtime/System/md/x86/x86ExceptionHandler.h
index 75aa628e4f6f..f6fc272ca867 100644
--- a/ef/Runtime/System/md/x86/x86Win32ExceptionHandler.h
+++ b/ef/Runtime/System/md/x86/x86ExceptionHandler.h
@@ -19,12 +19,12 @@
  *
  * Contributor(s): 
  */
-// x86Win32_Exception.cpp
+// x86ExceptionHandler.h
 //
 // simon
 
-#ifndef _X86WIN32_EXCEPTION_H_
-#define _X86WIN32_EXCEPTION_H_
+#ifndef _X86EXCEPTIONHANDLER_H_
+#define _X86EXCEPTIONHANDLER_H_
 
 #if defined(_WIN32)
 #include <excpt.h>
@@ -80,4 +80,4 @@ void printContext(LogModuleObject &f, Context* context);
 
 //--------------------------------------------------------------------------------
 
-#endif // _X86WIN32_EXCEPTION_H_
+#endif // _X86EXCEPTIONHANDLER_H_