rename patches to follow our naming conventions