Afsin issue 302 (rename/remove "partial" methods as match methods)