Fixed case change that caused the test failure.  Incorporarated Sean's review changes, consisting only of renaming and comment changes.

git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@187277 91177308-0d34-0410-b5e6-96231b3b80d8