Tidy up naming for consistency and other cleanup.  No functional change intended.

llvm-svn: 157358
1 file changed