am b7841ac: Rename some methods to confirm to our naming standards.

Merge commit 'b7841acd23f0cf4fd8db604d73bdf14e57994fd9'

* commit 'b7841acd23f0cf4fd8db604d73bdf14e57994fd9':
  Rename some methods to confirm to our naming standards.