Don't use the top-level keys, use newer nested ones

We're still relying on deprecated keys in webhook payloads.