rename Content to EntityMetadata
update Attribute Architectures