Bugfix: Replace "URL" with "URI" where we aren't actually working with URLs