Rename end_time to endTime