split and rename patches to make repoman more happy