Rename parameter for regex functions in builder

The new names conform more with what pylint requires of parameter names.