Fix name and date