Shorter names.

Signed-off-by: Thiago Farina <tfarina@chromium.org>