Rename timestamp to timestamp_end to reflect changes in event api