Consistent naming please.

Change-Id: I8a7e1d0a42aacdc7dcaeda0f7e51db78727f4b54
(cherry picked from commit 6f6d81c3b6f83956e7e01f99cc0314c675e56ffa)