Minor cleanup of URL -> Uri naming transition