Correct the filename pattern.
Underscore as joining character.
Allow periods.
Consistent escaping.