More renaming.

Change-Id: I6be2d61ca851e07aacb7b6c0a0f7646989be5a14
2 files changed