Fix metadata field names