Rename some variables to match the style guide.

I am about to patch this code, and this makes the diff far more readable.

llvm-svn: 189982
4 files changed