[XMAS-15] updated references to recipient_ fields