Fixed the naming bug.

Simplified the page serving element.