Rename, improve diff script