Rename OFUR{L -> I} in preparation for URI support