Rename functions to clarify usage.

Change-Id: Ie398b2fb6f83bc9013a6d452da5ad6e5fb7dee64