Rename local variables per style guide