[refactoring] renamed URIs to something that makes more sense