cleanup file names
cleanup failure message
Fix wrong location bug for Next impl