More consistent timestamp names

Closes #3