Merge "Change field names in policy notifications to match wiki"