Merge "Rename variable name to remove ambiguity"