Add Shortname, revise UriPart.