Can we include the uri in the name here like the others?