Minor variable name changes to eliminate ambiguity.