Renaming methods to be more explicit.

@phss