Rename timestamps
Merge pull request #8 from justfalter/clean_up_event

Rename timestamps