Ken Thomases : winemac: Rename some confusingly-named variables.