Change Regex for template job to use underscores

Change Regex for template job to use underscores rather than hyphens as the separator