LPS-38534 Renaming the field names to match the name that comes from the event