much better patch names