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