Annotations now use "uri" instead of "annotation".

For their identifiers.
Aggregates now use "uri" for both files and URIs.