rename patches to mateor's convention