changed all occurence of URI to URL for 2.x