Renamed generated variables, added win support