Renamed cdiff to sdiff all over the place