rename ts to timestamp