Changed timestamp keys to be more consistent.