Rename to better align with the naming used json.
Fix missing metadata
Setup defaults for common items.