Updated to rdf-URIs where possible.