Rename and fix comments and typo.

Test: all tests are still passing.
Bug: None

Change-Id: I931d299525f03f06693ebbcb1a74a027a92808c2
8 files changed