rename Metadata to MetadataProperty