Some renaming.

Change-Id: Ibf1529bb31764dbafb13dba948d3210a84eb17d3