Rename various functions for consistency and clarity. am: c17ace2f1c
am: 0fcc5241e2

Change-Id: I7b89e5a265c0186b77ef8a5f0d2a0a57f9a09582