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

Change-Id: I9bb1f680442d99cdd17996ca0f878812ae0cf927