Simplifying vaid-sre? to just call regexp.
Adding title-case.