Change conflicted variable name