Tidy ups in preparation for adding metrics

Various fixes / renames to keep the metrics change focused.

Bug: 172934905
Test: build / boot / treehugger
Change-Id: I8b658030c1e0457bc22590be7c636afe9bb0ed65
10 files changed