Updated naming to add timestamp

Dunno if it works yet