Update to Uri Templates
Update URIs in Resource Description to be inline with Uri Templates