Updated to rename Win32 libraries to more windows-specific names