Rename regex variables
Merge pull request #941 from mc10/regex

Rename regex variables