Update some docs & tweak some method names

Test: builds
Change-Id: Id0e5cf6fdb3a391136a1d314498f75e0b954ceeb
8 files changed