Cleanup page class names and comments

Change-Id: I739b5d9b295d09b86104133a8f4eb30070d664f2