user regular expression instead of name prefix, and better enums.