Fix date and name