Merge "Rename local variables"