Merge "Rename a member variable"