Rename various functions for consistency and clarity.
am: c17ace2f1c

Change-Id: I6cc7ebfbc15bf57a9a168dfe571a1a8a5156887a