Rename url -> uri
CS Fixing