Use better OS names because Java reports the Windows version as well as just Windows