Updated regexes to work on lower-case versions of the strings