Fix up "applypatch" for the big git rename