Fixing typo in Utility::PATH_REGEX that prevented it compiling.
Fixing filename matching after changing filename format.