fix date, rename