Rename Attributes to AttributeDefinitions