Renamed Win32 and x64 to w32 and w64