Rename some strings

Change-Id: Id7135abfe47108706bcfd9de64b2905b0e29de43