rename some fields and add cvss-related fields