Refactored : Changed page object field names