Merge "Address naming nit for local variable"