Redo naming for factored-out suffix regexes