Get rid of the magic floating timestamps
Prevent wrapping issues in names/timestamps