Correct architecture names for Windows and OS X packages.