Better and more descriptive naming.

Change-Id: Ic2e3b14399d2acc91c75922a25dc736b1605c320