Upgrade all uris to newest URI format