Mostly renaming some methods and updating comments to

reflect what these methods are actually doing. One method
template for future work. No change in functionality.

llvm-svn: 93742