Rename UriComponents into Uri, close #691