fix some timestamp naming