Consistent naming please.

Change-Id: I8a7e1d0a42aacdc7dcaeda0f7e51db78727f4b54