Renamed pages
Fixed merge issue