Changed URLS and PAGE and METHOD names