Rename patches to match conventions