Minor naming refactoring

Change-Id: Iefbbb33183c125fbcefe8414e69b08397ad21736
2 files changed