Renaming some APIs

Change-Id: I9e226d39648796f95dd0e86ffecbb3f93544243b
3 files changed