Using new page-object API

It is more similar to HTML element names.

Change-Id: Ie633deb08fd1b0f4459e0758f97f2e6f901de58b
Merge "Using new page-object API"