Rename functions.

Change-Id: I3fb014907c0162d9f20370bd72fe9d3c168173c2