Change start/end time field names, so as to not used reserved word end