Changed URIs to be universally useful.