Improve internal Uri naming