Fix variable name ambiguity