Setup v3

Use the correct field names.