diff --git a/reactos/tools/rbuild/module.cpp b/reactos/tools/rbuild/module.cpp
index d1c31385acc..95af1d0c8db 100644
--- a/reactos/tools/rbuild/module.cpp
+++ b/reactos/tools/rbuild/module.cpp
@@ -1113,23 +1113,23 @@ Module::GetDefaultModuleEntrypoint () const
 	switch ( type )
 	{
 		case Kernel:
-			if (Environment::GetArch() == "arm") return "KiSystemStartup";
-            return "KiSystemStartup@4";
+			if (Environment::GetArch() == "i386") return "KiSystemStartup@4";
+            return "KiSystemStartup";
 		case KeyboardLayout:
 		case KernelModeDLL:
 		case KernelModeDriver:
-            if (Environment::GetArch() == "arm") return "DriverEntry";
-			return "DriverEntry@8";
+            if (Environment::GetArch() == "i386") return "DriverEntry@8";
+			return "DriverEntry";
 		case NativeDLL:
-            if (Environment::GetArch() == "arm") return "DllMainCRTStartup";
-            return "DllMainCRTStartup@12";
+            if (Environment::GetArch() == "i386") return "DllMainCRTStartup@12";
+            return "DllMainCRTStartup";
 		case NativeCUI:
-            if (Environment::GetArch() == "arm") return "NtProcessStartup";
-            return "NtProcessStartup@4";
+            if (Environment::GetArch() == "i386") return "NtProcessStartup@4";
+            return "NtProcessStartup";
 		case Win32DLL:
 		case Win32OCX:
-            if (Environment::GetArch() == "arm") return "DllMain";
-			return "DllMain@12";
+            if (Environment::GetArch() == "i386") return "DllMain@12";
+			return "DllMain";
 		case Win32CUI:
 		case Test:
 			return "mainCRTStartup";