Rename Keyed interface to WithUri