Rename and add dates