fix timestamp field names