VP-119 Renaming URL to URI