refactoring to use regular expressions in feature definitions
being more explicit when naming the forms